update from main archive 960927

diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index 61724bf..842e63c 100644 (file)
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -1046,7 +1046,7 @@ const char *
 p_time(value)
        u_int32_t value;
 {
-       static char nbuf[40];
+       static char nbuf[60];
        int secs, mins, hours, days;
        register char *p;
 

diff --git a/resolv/res_init.c b/resolv/res_init.c
index caeb337..c8a74f6 100644 (file)
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -216,7 +216,7 @@ res_init()
        _res.pfcode = 0;
 
        /* Allow user to override the local domain definition */
-       if ((cp = getenv("LOCALDOMAIN")) != NULL) {
+       if ((cp = __secure_getenv("LOCALDOMAIN")) != NULL) {
                (void)strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
                haveenv++;
 
@@ -421,7 +421,7 @@ res_init()
 #endif /* !RFC1535 */
        }
 
-       if ((cp = getenv("RES_OPTIONS")) != NULL)
+       if ((cp = __secure_getenv("RES_OPTIONS")) != NULL)
                res_setoptions(cp, "env");
        _res.options |= RES_INIT;
        return (0);

diff --git a/resolv/res_query.c b/resolv/res_query.c
index e989802..ac50a9c 100644 (file)
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -363,7 +363,7 @@ hostalias(name)
 
        if (_res.options & RES_NOALIASES)
                return (NULL);
-       file = getenv("HOSTALIASES");
+       file = __secure_getenv("HOSTALIASES");
        if (file == NULL || (fp = fopen(file, "r")) == NULL)
                return (NULL);
        setbuf(fp, NULL);