aboutsummaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2015-03-13 09:49:24 -0400
committerCarlos O'Donell <carlos@systemhalted.org>2015-03-13 09:49:24 -0400
commitcf9313e7d1dd42addd6cf8c9277f0f18a62cdeff (patch)
tree6bbf8900b476073a3d30cf24aae7b317b65344fc /nss
parent7d67a196b6548562070ac11fc673c0d3d263d846 (diff)
downloadglibc-cf9313e7d1dd42addd6cf8c9277f0f18a62cdeff.zip
glibc-cf9313e7d1dd42addd6cf8c9277f0f18a62cdeff.tar.gz
glibc-cf9313e7d1dd42addd6cf8c9277f0f18a62cdeff.tar.bz2
Enhance nscd's inotify support (Bug 14906).
In bug 14906 the user complains that the inotify support in nscd is not sufficient when it comes to detecting changes in the configurationfiles that should be watched for the various databases. The current nscd implementation uses inotify to watch for changes in the configuration files, but adds watches only for IN_DELETE_SELF and IN_MODIFY. These watches are insufficient to cover even the most basic uses by a system administrator. For example using emacs or vim to edit a configuration file should trigger a reload but it might not if the editors use move to atomically update the file. This atomic update changes the inode and thus removes the notification on the file (as inotify is based on inodes). Thus the inotify support in nscd for configuration files is insufficient to account for the average use cases of system administrators and users. The inotify support is significantly enhanced and described here: https://www.sourceware.org/ml/libc-alpha/2015-02/msg00504.html Tested on x86_64 with and without inotify support.
Diffstat (limited to 'nss')
-rw-r--r--nss/nss_db/db-init.c28
-rw-r--r--nss/nss_files/files-init.c46
2 files changed, 30 insertions, 44 deletions
diff --git a/nss/nss_db/db-init.c b/nss/nss_db/db-init.c
index 041471c..099d89b 100644
--- a/nss/nss_db/db-init.c
+++ b/nss/nss_db/db-init.c
@@ -22,35 +22,25 @@
#include <nscd/nscd.h>
#include <string.h>
-static union
-{
- struct traced_file file;
- char buf[sizeof (struct traced_file) + sizeof (_PATH_VARDB "passwd.db")];
-} pwd_traced_file;
-
-static union
-{
- struct traced_file file;
- char buf[sizeof (struct traced_file) + sizeof (_PATH_VARDB "group.db")];
-} grp_traced_file;
+#define PWD_FILENAME (_PATH_VARDB "passwd.db")
+define_traced_file (pwd, PWD_FILENAME);
-static union
-{
- struct traced_file file;
- char buf[sizeof (struct traced_file) + sizeof (_PATH_VARDB "services.db")];
-} serv_traced_file;
+#define GRP_FILENAME (_PATH_VARDB "group.db")
+define_traced_file (grp, GRP_FILENAME);
+#define SERV_FILENAME (_PATH_VARDB "services.db")
+define_traced_file (serv, SERV_FILENAME);
void
_nss_db_init (void (*cb) (size_t, struct traced_file *))
{
- strcpy (pwd_traced_file.file.fname,_PATH_VARDB "passwd.db");
+ init_traced_file (&pwd_traced_file.file, PWD_FILENAME, 0);
cb (pwddb, &pwd_traced_file.file);
- strcpy (grp_traced_file.file.fname, _PATH_VARDB "group.db");
+ init_traced_file (&grp_traced_file.file, GRP_FILENAME, 0);
cb (grpdb, &grp_traced_file.file);
- strcpy (serv_traced_file.file.fname, _PATH_VARDB "services.db");
+ init_traced_file (&serv_traced_file.file, SERV_FILENAME, 0);
cb (servdb, &serv_traced_file.file);
}
diff --git a/nss/nss_files/files-init.c b/nss/nss_files/files-init.c
index 94d440a..72eced4 100644
--- a/nss/nss_files/files-init.c
+++ b/nss/nss_files/files-init.c
@@ -21,47 +21,43 @@
#include <string.h>
#include <nscd/nscd.h>
+#define PWD_FILENAME "/etc/passwd"
+define_traced_file (pwd, PWD_FILENAME);
-#define TF(id, filename, ...) \
-static union \
-{ \
- struct traced_file file; \
- char buf[sizeof (struct traced_file) + sizeof (filename)]; \
-} id##_traced_file = \
- { \
- .file = \
- { \
- __VA_ARGS__ \
- } \
- }
-
-TF (pwd, "/etc/passwd");
-TF (grp, "/etc/group");
-TF (hst, "/etc/hosts");
-TF (resolv, "/etc/resolv.conf", .call_res_init = 1);
-TF (serv, "/etc/services");
-TF (netgr, "/etc/netgroup");
+#define GRP_FILENAME "/etc/group"
+define_traced_file (grp, GRP_FILENAME);
+#define HST_FILENAME "/etc/hosts"
+define_traced_file (hst, HST_FILENAME);
+
+#define RESOLV_FILENAME "/etc/resolv.conf"
+define_traced_file (resolv, RESOLV_FILENAME);
+
+#define SERV_FILENAME "/etc/services"
+define_traced_file (serv, SERV_FILENAME);
+
+#define NETGR_FILENAME "/etc/netgroup"
+define_traced_file (netgr, NETGR_FILENAME);
void
_nss_files_init (void (*cb) (size_t, struct traced_file *))
{
- strcpy (pwd_traced_file.file.fname, "/etc/passwd");
+ init_traced_file (&pwd_traced_file.file, PWD_FILENAME, 0);
cb (pwddb, &pwd_traced_file.file);
- strcpy (grp_traced_file.file.fname, "/etc/group");
+ init_traced_file (&grp_traced_file.file, GRP_FILENAME, 0);
cb (grpdb, &grp_traced_file.file);
- strcpy (hst_traced_file.file.fname, "/etc/hosts");
+ init_traced_file (&hst_traced_file.file, HST_FILENAME, 0);
cb (hstdb, &hst_traced_file.file);
- strcpy (resolv_traced_file.file.fname, "/etc/resolv.conf");
+ init_traced_file (&resolv_traced_file.file, RESOLV_FILENAME, 1);
cb (hstdb, &resolv_traced_file.file);
- strcpy (serv_traced_file.file.fname, "/etc/services");
+ init_traced_file (&serv_traced_file.file, SERV_FILENAME, 0);
cb (servdb, &serv_traced_file.file);
- strcpy (netgr_traced_file.file.fname, "/etc/netgroup");
+ init_traced_file (&netgr_traced_file.file, NETGR_FILENAME, 0);
cb (netgrdb, &netgr_traced_file.file);
}