blob: a73bcebe3492f87dd0fa92b0fffeda53439b6f23 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
cherry-picked from http://www.eglibc.org/archives/patches/msg00772.html
It hasnt yet been merged into glibc
Signed-off-by: Khem Raj
Upstream-Status: Pending
Index: git/resolv/res_libc.c
===================================================================
--- git.orig/resolv/res_libc.c 2014-08-27 18:35:15.492070587 +0000
+++ git/resolv/res_libc.c 2014-08-27 18:35:19.204070587 +0000
@@ -22,12 +22,13 @@
#include <arpa/nameser.h>
#include <resolv.h>
#include <bits/libc-lock.h>
-
+#include <sys/stat.h>
/* The following bit is copied from res_data.c (where it is #ifdef'ed
out) since res_init() should go into libc.so but the rest of that
file should not. */
+__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
@@ -35,7 +36,6 @@
# 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
@@ -94,7 +94,18 @@
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);
|
