about summary refs log tree commit diff
path: root/grp
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 /grp
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 'grp')
-rw-r--r--grp/initgroups.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/grp/initgroups.c b/grp/initgroups.c
index 3e4a3de11f..45dd391c42 100644
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -26,10 +26,16 @@
 #include <sys/types.h>
 #include <nsswitch.h>
 #include <scratch_buffer.h>
+#include <config.h>
 
 #include "../nscd/nscd-client.h"
 #include "../nscd/nscd_proto.h"
 
+#ifdef LINK_OBSOLETE_NSL
+# define DEFAULT_CONFIG "compat [NOTFOUND=return] files"
+#else
+# define DEFAULT_CONFIG "files"
+#endif
 
 /* Type of the lookup function.  */
 typedef enum nss_status (*initgroups_dyn_function) (const char *, gid_t,
@@ -77,7 +83,7 @@ internal_getgrouplist (const char *user, gid_t group, long int *size,
 				 &__nss_initgroups_database) < 0)
 	{
 	  if (__nss_group_database == NULL)
-	    no_more = __nss_database_lookup ("group", NULL, "compat files",
+	    no_more = __nss_database_lookup ("group", NULL, DEFAULT_CONFIG,
 					     &__nss_group_database);
 
 	  __nss_initgroups_database = __nss_group_database;