summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-10-19 11:51:10 +0000
committerbapt <bapt@FreeBSD.org>2015-10-19 11:51:10 +0000
commitd93a51152871c391e2ff845cfd568a72cef65606 (patch)
treec6a11d30ab57567b8bd34aa1c679296e53bab799 /include
parent4f9c78fa034aa8b8b2762c76143139953e2e2474 (diff)
parent5855be3ec6724e6451361f6ef8bd165bf9f949df (diff)
downloadFreeBSD-src-d93a51152871c391e2ff845cfd568a72cef65606.zip
FreeBSD-src-d93a51152871c391e2ff845cfd568a72cef65606.tar.gz
Merge from head
Diffstat (limited to 'include')
-rw-r--r--include/Makefile1
-rw-r--r--include/resolv.h5
2 files changed, 5 insertions, 1 deletions
diff --git a/include/Makefile b/include/Makefile
index 1cecff7..eed1c92 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -7,6 +7,7 @@
CLEANFILES= osreldate.h version vers.c
SUBDIR= arpa protocols rpcsvc rpc xlocale
+SUBDIR_PARALLEL=
INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
db.h \
dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
diff --git a/include/resolv.h b/include/resolv.h
index e3d4fd1..78da374 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -176,7 +176,8 @@ struct __res_state {
int res_h_errno; /*%< last one set for this context */
int _vcsock; /*%< PRIVATE: for res_send VC i/o */
u_int _flags; /*%< PRIVATE: see below */
- u_int _pad; /*%< make _u 64 bit aligned */
+ u_short reload_period; /*%< seconds between stat(resolv.conf)*/
+ u_short _pad; /*%< make _u 64 bit aligned */
union {
/* On an 32-bit arch this means 512b total. */
char pad[72 - 4*sizeof (int) - 3*sizeof (void *)];
@@ -188,6 +189,8 @@ struct __res_state {
} _ext;
} _u;
u_char *_rnd; /*%< PRIVATE: random state */
+ struct timespec conf_mtim; /*%< mod time of loaded resolv.conf */
+ time_t conf_stat; /*%< time of last stat(resolv.conf) */
};
typedef struct __res_state *res_state;
OpenPOWER on IntegriCloud