From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 12 Jan 2007 17:05:59 +0000 (+0000)
Subject: 	* nis/nis_subr.c (nis_getnames): Revert last change.
X-Git-Tag: cvs/fedora-glibc-2_5-20070712T1701~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a725509fd14ec55c5b8a4bdf84db63301f15844;p=thirdparty%2Fglibc.git

	* nis/nis_subr.c (nis_getnames): Revert last change.

	* nis/nis_defaults.c (__nis_default_access): Don't call getenv twice.

	* nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv.
	* sysdeps/generic/unsecvars.h: Add NIS_PATH.
---

diff --git a/ChangeLog b/ChangeLog
index 80a95fe2a93..c1720cde3ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-12-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* nis/nis_subr.c (nis_getnames): Revert last change.
+
+2006-10-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* nis/nis_defaults.c (__nis_default_access): Don't call getenv twice.
+
+	* nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv.
+	* sysdeps/generic/unsecvars.h: Add NIS_PATH.
+
 2006-12-04  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/ttyname.c: Include termios.h.
diff --git a/nis/nis_defaults.c b/nis/nis_defaults.c
index 59fbbe4b26e..ed79b59ec6f 100644
--- a/nis/nis_defaults.c
+++ b/nis/nis_defaults.c
@@ -447,7 +447,7 @@ __nis_default_access (char *param, unsigned int defaults)
     {
       cptr = getenv ("NIS_DEFAULTS");
       if (cptr != NULL && strstr (cptr, "access=") != NULL)
-	result = searchaccess (getenv ("NIS_DEFAULTS"), result);
+	result = searchaccess (cptr, result);
     }
 
   return result;
diff --git a/sysdeps/generic/unsecvars.h b/sysdeps/generic/unsecvars.h
index a7378b742f6..d5b8119c9cb 100644
--- a/sysdeps/generic/unsecvars.h
+++ b/sysdeps/generic/unsecvars.h
@@ -18,6 +18,7 @@
   "LOCALDOMAIN\0"							      \
   "LOCPATH\0"								      \
   "MALLOC_TRACE\0"							      \
+  "NIS_PATH\0"								      \
   "NLSPATH\0"								      \
   "RESOLV_HOST_CONF\0"							      \
   "RES_OPTIONS\0"							      \