diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-09-26 09:46:55 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-09-26 09:46:55 +0000 |
| commit | 74955460c5b9f23d7783395ce2478f5b7c5fd876 (patch) | |
| tree | e0ddae614d73c52ebaac1e65d3d9fbaf6aafe4e6 /resolv | |
| parent | 316ca440b070114ba877455c3dbbcdc1b20e4f33 (diff) | |
| download | glibc-74955460c5b9f23d7783395ce2478f5b7c5fd876.tar.gz glibc-74955460c5b9f23d7783395ce2478f5b7c5fd876.tar.xz glibc-74955460c5b9f23d7783395ce2478f5b7c5fd876.zip | |
Update.
2000-09-26 Thorsten Kukuk <kukuk@suse.de> * nscd/dbg_log.c (dbg_log): Add missing format string. * catgets/catgets.c (catopen): Use getenv instead of __secure_getenv since we filter out the variable once. * iconv/gconv_conf.c (__gconv_get_path): Likewise. * locale/newlocale.c (__newlocale): Likewise. * locale/setlocale.c (setlocale): Likewise. * malloc/malloc.c (ptmalloc_init): Likewise. * resolv/res_hconf.c (_res_hconf_init): Likewise. * resolv/res_init.c (__res_vinit): Likewise. * time/tzfile.c (__tzfile_read): Likewise. * sysdeps/generic/unsecvars.h: New file. * elf/dl-support.c (non_dynamic_init): Use it here to remove variables. * elf/rtld.c (process_envvars): Likewise. * elf/Makefile (distribute): Add unsecvars.h.
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/res_hconf.c | 2 | ||||
| -rw-r--r-- | resolv/res_init.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c index 243cfbe0ec..cb5fe38a51 100644 --- a/resolv/res_hconf.c +++ b/resolv/res_hconf.c @@ -327,7 +327,7 @@ _res_hconf_init (void) memset (&_res_hconf, '\0', sizeof (_res_hconf)); - hconf_name = __secure_getenv (ENV_HOSTCONF); + hconf_name = getenv (ENV_HOSTCONF); if (hconf_name == NULL) hconf_name = _PATH_HOSTCONF; diff --git a/resolv/res_init.c b/resolv/res_init.c index e0ea6edc3a..fa60b77c81 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -185,7 +185,7 @@ __res_vinit(res_state statp, int preinit) { #endif /* Allow user to override the local domain definition */ - if ((cp = __secure_getenv("LOCALDOMAIN")) != NULL) { + if ((cp = getenv("LOCALDOMAIN")) != NULL) { (void)strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1); statp->defdname[sizeof(statp->defdname) - 1] = '\0'; haveenv++; @@ -423,7 +423,7 @@ __res_vinit(res_state statp, int preinit) { #endif /* !RFC1535 */ } - if ((cp = __secure_getenv("RES_OPTIONS")) != NULL) + if ((cp = getenv("RES_OPTIONS")) != NULL) res_setoptions(statp, cp, "env"); statp->options |= RES_INIT; return (0); |