From 3ab2021feae3b5ae6ef0a7fd30eeef2cfa688a17 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 25 Jan 2017 12:54:57 -0800 Subject: Fix build with --enable-static-nss [BZ #21088] Signed-off-by: Alexey Neyman --- ChangeLog | 6 ++++++ nss/nsswitch.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 47faa520be..48d285f49c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-03-15 Alexey Neyman + + [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 * configure.ac: Avoid empty subexpression in grep. 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. */ -- cgit 1.4.1