about summary refs log tree commit diff
path: root/nscd/connections.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2023-08-11 10:10:16 +0200
committerFlorian Weimer <fweimer@redhat.com>2023-08-11 10:10:16 +0200
commit039ff51ac7e02db1cfc0c23e38ac7bfbb00221d1 (patch)
tree9b61ff729e18e085ea908cd6508a368ce9dcdabc /nscd/connections.c
parent881546979d0219c18337e1b4f4d00cfacab13c40 (diff)
downloadglibc-039ff51ac7e02db1cfc0c23e38ac7bfbb00221d1.tar.gz
glibc-039ff51ac7e02db1cfc0c23e38ac7bfbb00221d1.tar.xz
glibc-039ff51ac7e02db1cfc0c23e38ac7bfbb00221d1.zip
nscd: Do not rebuild getaddrinfo (bug 30709)
The nscd daemon caches hosts data from NSS modules verbatim, without
filtering protocol families or sorting them (otherwise separate caches
would be needed for certain ai_flags combinations).  The cache
implementation is complete separate from the getaddrinfo code.  This
means that rebuilding getaddrinfo is not needed.  The only function
actually used is __bump_nl_timestamp from check_pf.c, and this change
moves it into nscd/connections.c.

Tested on x86_64-linux-gnu with -fexceptions, built with
build-many-glibcs.py.  I also backported this patch into a distribution
that still supports nscd and verified manually that caching still works.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Diffstat (limited to 'nscd/connections.c')
-rw-r--r--nscd/connections.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/nscd/connections.c b/nscd/connections.c
index a405a44a9b..15693e5090 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -256,6 +256,17 @@ int inotify_fd = -1;
 #ifdef HAVE_NETLINK
 /* Descriptor for netlink status updates.  */
 static int nl_status_fd = -1;
+
+static uint32_t
+__bump_nl_timestamp (void)
+{
+  static uint32_t nl_timestamp;
+
+  if (atomic_fetch_add_relaxed (&nl_timestamp, 1) + 1 == 0)
+    atomic_fetch_add_relaxed (&nl_timestamp, 1);
+
+  return nl_timestamp;
+}
 #endif
 
 /* Number of times clients had to wait.  */