qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* nscd/connections.c: Also recognize and handle changes to the 

resolver configuration file.
This commit is contained in:
Ulrich Drepper 2008-06-13 16:31:07 +00:00
parent 5bcc6c0f96
commit a0edbb484a
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-13 Ulrich Drepper <drepper@redhat.com>
* nscd/connections.c: Also recognize and handle changes to the
resolver configuration file.
2008-06-12 Ulrich Drepper <drepper@redhat.com> 2008-06-12 Ulrich Drepper <drepper@redhat.com>
* time/strftime.c: Pass reference to tzset_called around to handle * time/strftime.c: Pass reference to tzset_called around to handle

28
nscd/connections.c
View File

@ -51,6 +51,7 @@
#include "nscd.h" #include "nscd.h"
#include "dbg_log.h" #include "dbg_log.h"
#include "selinux.h" #include "selinux.h"
#include <resolv/resolv.h>
#ifdef HAVE_SENDFILE #ifdef HAVE_SENDFILE
# include <kernel-features.h> # include <kernel-features.h>
#endif #endif
@ -228,6 +229,9 @@ static int sock;
#ifdef HAVE_INOTIFY #ifdef HAVE_INOTIFY
/* Inotify descriptor. */ /* Inotify descriptor. */
static int inotify_fd = -1; static int inotify_fd = -1;
/* Watch descriptor for resolver configuration file. */
static int resolv_conf_descr = -1;
#endif #endif
/* Number of times clients had to wait. */ /* Number of times clients had to wait. */
@ -824,7 +828,7 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
if (dbs[cnt].check_file) if (dbs[cnt].check_file)
{ {
#ifdef HAVE_INOTIFY #ifdef HAVE_INOTIFY
if (inotify_fd == -1 if (inotify_fd < 0
|| (dbs[cnt].inotify_descr || (dbs[cnt].inotify_descr
= inotify_add_watch (inotify_fd, dbs[cnt].filename, = inotify_add_watch (inotify_fd, dbs[cnt].filename,
IN_DELETE_SELF | IN_MODIFY)) < 0) IN_DELETE_SELF | IN_MODIFY)) < 0)
@ -845,6 +849,14 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
dbs[cnt].file_mtime = st.st_mtime; dbs[cnt].file_mtime = st.st_mtime;
} }
} }
#ifdef HAVE_INOTIFY
if (cnt == hstdb && inotify_fd >= -1)
/* We also monitor the resolver configuration file. */
resolv_conf_descr = inotify_add_watch (inotify_fd,
_PATH_RESCONF,
IN_DELETE_SELF | IN_MODIFY);
#endif
} }
/* Create the socket. */ /* Create the socket. */
@ -1798,6 +1810,7 @@ main_loop_poll (void)
{ {
if (conns[1].revents != 0) if (conns[1].revents != 0)
{ {
bool done[lastdb] = { false, };
union union
{ {
struct inotify_event i; struct inotify_event i;
@ -1810,12 +1823,21 @@ main_loop_poll (void)
{ {
/* Check which of the files changed. */ /* Check which of the files changed. */
for (size_t dbcnt = 0; dbcnt < lastdb; ++dbcnt) for (size_t dbcnt = 0; dbcnt < lastdb; ++dbcnt)
if (inev.i.wd == dbs[dbcnt].inotify_descr) if (!done[dbcnt]
&& (inev.i.wd == dbs[dbcnt].inotify_descr
|| (dbcnt == hstdb
&& inev.i.wd == resolv_conf_descr)))
{ {
pthread_mutex_trylock (&dbs[dbcnt].prune_lock); if (dbcnt == hstdb
&& inev.i.wd == resolv_conf_descr)
res_init ();
pthread_mutex_lock (&dbs[dbcnt].prune_lock);
dbs[dbcnt].clear_cache = 1; dbs[dbcnt].clear_cache = 1;
pthread_mutex_unlock (&dbs[dbcnt].prune_lock); pthread_mutex_unlock (&dbs[dbcnt].prune_lock);
pthread_cond_signal (&dbs[dbcnt].prune_cond); pthread_cond_signal (&dbs[dbcnt].prune_cond);
done[dbcnt] = true;
break; break;
} }
} }