aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--localedata/locales/cs_CZ6
-rw-r--r--resolv/res_query.c12
-rw-r--r--sysdeps/generic/unsecvars.h1
4 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 0de4132ade..4c104dfb85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2001-01-08 Ulrich Drepper <drepper@redhat.com>
+ * resolv/res_query.c: Use simply getenv() for HOSTALIASES.
+ * sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add HOSTALIASES.
+
* sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add missing comma.
* malloc/memusage.c (me): Use access() to determine whether we
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 19f2687f0c..0b57172045 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -2417,9 +2417,9 @@ abmon "<U006C><U0065><U0064>";/
"<U006C><U0069><U0073>";/
"<U0070><U0072><U006F>"
-% Zde jsou zkratky doporučené poradnou Ústavu pro Jazyk Český
-% Ano vidíte správně, jsou to anglické zkratky. Myslím si, že nejsou
-% až tak zažité, aby se používali. Pokud člověk nezná celé názvy měsíců
+% Zde jsou zkratky doporučené poradnou Ústavu pro Jazyk Český.
+% Ano, vidíte správně, jsou to anglické zkratky. Myslím si, že nejsou
+% až tak zažité, aby se používaly. Pokud člověk nezná celé názvy měsíců,
% těžko tyto zkratky odvozuje.
%abmon "<U004A><U0061><U006E>";/
% "<U0046><U0065><U0062>";/
diff --git a/resolv/res_query.c b/resolv/res_query.c
index 00a5e3eec3..92a90d6d8a 100644
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -1,7 +1,7 @@
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -13,7 +13,7 @@
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,14 +29,14 @@
/*
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies, and that
* the name of Digital Equipment Corporation not be used in advertising or
* publicity pertaining to distribution of the document or software without
* specific, written prior permission.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -287,7 +287,7 @@ res_nsearch(res_state statp,
}
/*
- * If the name has any dots at all, and no earlier 'as-is' query
+ * If the name has any dots at all, and no earlier 'as-is' query
* for the name, and "." is not on the search list, then try an as-is
* query now.
*/
@@ -371,7 +371,7 @@ res_hostalias(const res_state statp, const char *name, char *dst, size_t siz) {
if (statp->options & RES_NOALIASES)
return (NULL);
- file = __secure_getenv("HOSTALIASES");
+ file = getenv("HOSTALIASES");
if (file == NULL || (fp = fopen(file, "r")) == NULL)
return (NULL);
setbuf(fp, NULL);
diff --git a/sysdeps/generic/unsecvars.h b/sysdeps/generic/unsecvars.h
index b1469f180f..cd08bb8a0d 100644
--- a/sysdeps/generic/unsecvars.h
+++ b/sysdeps/generic/unsecvars.h
@@ -1,6 +1,7 @@
/* Environment variable to be removed for SUID programs. */
#define UNSECURE_ENVVARS \
"GCONV_PATH", \
+ "HOSTALIASES", \
"LOCALDOMAIN", \
"LOCPATH", \
"MALLOC_TRACE", \