* 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 80a95fe2a9376bbdee28b5621a9ef61ce93d2cbb..c1720cde3edd6a7831de26508ce004bdfb5b2f69 100644 (file)
--- 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 59fbbe4b26e06f33ab5e084942e4f2a04baf48cf..ed79b59ec6f5c31de0f70e6834b3146edbe2eaf0 100644 (file)
--- 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 a7378b742f611d16709f61cb47c937de39139866..d5b8119c9cb5cf5f1391325282287c5935c86589 100644 (file)
--- 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"                                                            \