about summary refs log tree commit diff
path: root/nss/grp-lookup.c
diff options
context:
space:
mode:
authorSteve Ellcey <sellcey@caviumnetworks.com>2017-09-12 10:21:48 -0700
committerSteve Ellcey <sellcey@caviumnetworks.com>2017-09-12 10:21:48 -0700
commita1a78204162561872634d517b82e8a865c7058cc (patch)
tree82117b8f03ae93b25407f745a047202496ca5c50 /nss/grp-lookup.c
parentef8adeb0416309082c41a1518caee6961b5c42e8 (diff)
downloadglibc-a1a78204162561872634d517b82e8a865c7058cc.tar.gz
glibc-a1a78204162561872634d517b82e8a865c7058cc.tar.xz
glibc-a1a78204162561872634d517b82e8a865c7058cc.zip
Remove compat from DEFAULT_CONFIG lookup strings
	* grp/initgroups.c: Include config.h.
	(DEFAULT_CONFIG): New macro.
	(internal_getgrouplist): Use DEFAULT_CONFIG.
	* nscd/initgrcache.c (addinitgroupsX): Likewise.
	* nss/nsswitch.c (__nss_disable_nscd): Likewise.
	(DEFAULT_DEFCONFIG): New macro.
	(__nss_database_lookup): Use DEFAULT_DEFCONFIG.
	* nss/grp-lookup.c: Include config.h
	(DEFAULT_CONFIG): Set definition based on LINK_OBSOLETE_NSL.
	* nss/pwd-lookup.c (DEFAULT_CONFIG): Likewise.
	* nss/spwd-lookup.c (DEFAULT_CONFIG): Likewise.
	* manual/nss.texi: Update default values section.
Diffstat (limited to 'nss/grp-lookup.c')
-rw-r--r--nss/grp-lookup.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/nss/grp-lookup.c b/nss/grp-lookup.c
index 8cb00aa22f..7c019f85b2 100644
--- a/nss/grp-lookup.c
+++ b/nss/grp-lookup.c
@@ -16,7 +16,13 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <config.h>
+
 #define DATABASE_NAME group
-#define DEFAULT_CONFIG "compat [NOTFOUND=return] files"
+#ifdef LINK_OBSOLETE_NSL
+# define DEFAULT_CONFIG "compat [NOTFOUND=return] files"
+#else
+# define DEFAULT_CONFIG "files"
+#endif
 
 #include "XXX-lookup.c"