This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.25-119-g3ab2021
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Mar 2017 20:34:06 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.25-119-g3ab2021
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 3ab2021feae3b5ae6ef0a7fd30eeef2cfa688a17 (commit)
from e37fc4aa68317bff9d3f668da1c0779d283dab51 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3ab2021feae3b5ae6ef0a7fd30eeef2cfa688a17
commit 3ab2021feae3b5ae6ef0a7fd30eeef2cfa688a17
Author: Alexey Neyman <stilor@att.net>
Date: Wed Jan 25 12:54:57 2017 -0800
Fix build with --enable-static-nss [BZ #21088]
Signed-off-by: Alexey Neyman <stilor@att.net>
diff --git a/ChangeLog b/ChangeLog
index 47faa52..48d285f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2017-03-15 Alexey Neyman <stilor@att.net>
+ [BZ #21088]
+ * nss/nsswitch.c (nscd_init_cb, is_nscd): Make the #if check
+ around definitions match those around use.
+
+2017-03-15 Alexey Neyman <stilor@att.net>
+
* configure.ac: Avoid empty subexpression in grep.
* configure: Regenerate.
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 0a65f6a..8f31658 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -94,7 +94,7 @@ static name_database *service_table;
static name_database_entry *defconfig_entries;
-#ifdef USE_NSCD
+#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED)
/* Nonzero if this is the nscd process. */
static bool is_nscd;
/* The callback passed to the init functions when nscd is used. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
nss/nsswitch.c | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources