diff options
| author | Alexey Neyman <stilor@att.net> | 2017-01-25 12:54:57 -0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2017-03-15 13:32:23 -0700 |
| commit | 3ab2021feae3b5ae6ef0a7fd30eeef2cfa688a17 (patch) | |
| tree | eeae1fe502408ab8821752bbd5a13aa392a47215 | |
| parent | e37fc4aa68317bff9d3f668da1c0779d283dab51 (diff) | |
| download | glibc-3ab2021feae3b5ae6ef0a7fd30eeef2cfa688a17.tar.gz glibc-3ab2021feae3b5ae6ef0a7fd30eeef2cfa688a17.tar.xz glibc-3ab2021feae3b5ae6ef0a7fd30eeef2cfa688a17.zip | |
Fix build with --enable-static-nss [BZ #21088]
Signed-off-by: Alexey Neyman <stilor@att.net>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nss/nsswitch.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 47faa520be..48d285f49c 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 0a65f6ad0c..8f31658523 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. */ |