summaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-06-13 16:31:07 +0000
committerUlrich Drepper <drepper@redhat.com>2008-06-13 16:31:07 +0000
commita0edbb484a9b8988ba6996436d5abac0e572377f (patch)
tree36edaf16d1bad57d85b8e8c0f336c820b1e2a71f /nscd
parent5bcc6c0f96789e52caa4ffdded7856472bb895e2 (diff)
downloadglibc-a0edbb484a9b8988ba6996436d5abac0e572377f.tar.gz
* nscd/connections.c: Also recognize and handle changes to the
resolver configuration file.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/connections.c28
1 files changed, 25 insertions, 3 deletions
diff --git a/nscd/connections.c b/nscd/connections.c
index bef1c16d1e..bf07f5e791 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -51,6 +51,7 @@
#include "nscd.h"
#include "dbg_log.h"
#include "selinux.h"
+#include <resolv/resolv.h>
#ifdef HAVE_SENDFILE
# include <kernel-features.h>
#endif
@@ -228,6 +229,9 @@ static int sock;
#ifdef HAVE_INOTIFY
/* Inotify descriptor. */
static int inotify_fd = -1;
+
+/* Watch descriptor for resolver configuration file. */
+static int resolv_conf_descr = -1;
#endif
/* 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)
{
#ifdef HAVE_INOTIFY
- if (inotify_fd == -1
+ if (inotify_fd < 0
|| (dbs[cnt].inotify_descr
= inotify_add_watch (inotify_fd, dbs[cnt].filename,
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;
}
}
+
+#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. */
@@ -1798,6 +1810,7 @@ main_loop_poll (void)
{
if (conns[1].revents != 0)
{
+ bool done[lastdb] = { false, };
union
{
struct inotify_event i;
@@ -1810,12 +1823,21 @@ main_loop_poll (void)
{
/* Check which of the files changed. */
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;
pthread_mutex_unlock (&dbs[dbcnt].prune_lock);
pthread_cond_signal (&dbs[dbcnt].prune_cond);
+
+ done[dbcnt] = true;
break;
}
}