From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sat, 2 Dec 2017 10:07:17 +0000 (+0000)
Subject: local-dynamic-resolvconf
X-Git-Tag: archive/raspbian/2.25-3+rpi1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=38d20adf212321b87bd1d2b03907f39697197052;p=glibc.git

local-dynamic-resolvconf


Gbp-Pq: Topic any
Gbp-Pq: Name local-dynamic-resolvconf.diff
---

diff --git a/resolv/res_libc.c b/resolv/res_libc.c
index a4b376f15..cc01898d8 100644
--- a/resolv/res_libc.c
+++ b/resolv/res_libc.c
@@ -25,7 +25,9 @@
 #include <arpa/nameser.h>
 #include <resolv.h>
 #include <libc-lock.h>
+#include <sys/stat.h>
 
+__libc_lock_define_initialized (static, lock);
 extern unsigned long long int __res_initstamp attribute_hidden;
 /* We have atomic increment operations on 64-bit platforms.  */
 #if __WORDSIZE == 64
@@ -33,7 +35,6 @@ extern unsigned long long int __res_initstamp attribute_hidden;
 # define atomicincunlock(lock) (void) 0
 # define atomicinc(var) catomic_increment (&(var))
 #else
-__libc_lock_define_initialized (static, lock);
 # define atomicinclock(lock) __libc_lock_lock (lock)
 # define atomicincunlock(lock) __libc_lock_unlock (lock)
 # define atomicinc(var) ++var
@@ -92,7 +93,18 @@ res_init(void) {
 int
 __res_maybe_init (res_state resp, int preinit)
 {
+	static time_t last_mtime;
+	struct stat statbuf;
+	int ret;
+
 	if (resp->options & RES_INIT) {
+		ret = stat (_PATH_RESCONF, &statbuf);
+		__libc_lock_lock (lock);
+		if ((ret == 0) && (last_mtime != statbuf.st_mtime)) {
+			last_mtime = statbuf.st_mtime;
+			atomicinc (__res_initstamp);
+		}
+		__libc_lock_unlock (lock);
 		if (__res_initstamp != resp->_u._ext.initstamp) {
 			if (resp->nscount > 0)
 				__res_iclose (resp, true);