1 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e6567be03e..2bb21f021d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2017-09-12  Steve Ellcey  <sellcey@cavium.com>
+
+	* 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.
+
 2017-09-12  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #21967]