1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
* resolv/res_query.c: Use simply getenv() for HOSTALIASES.
	* sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add HOSTALIASES.
This commit is contained in:
Ulrich Drepper
2001-01-08 17:55:53 +00:00
parent 0eb8a89b50
commit 52ee62236b
4 changed files with 13 additions and 9 deletions

View File

@@ -1,5 +1,8 @@
2001-01-08 Ulrich Drepper <drepper@redhat.com> 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. * sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add missing comma.
* malloc/memusage.c (me): Use access() to determine whether we * malloc/memusage.c (me): Use access() to determine whether we

View File

@@ -2417,9 +2417,9 @@ abmon "<U006C><U0065><U0064>";/
"<U006C><U0069><U0073>";/ "<U006C><U0069><U0073>";/
"<U0070><U0072><U006F>" "<U0070><U0072><U006F>"
% Zde jsou zkratky doporu<72>en<65> poradnou <20>stavu pro Jazyk <20>esk<73> % Zde jsou zkratky doporu<72>en<65> poradnou <20>stavu pro Jazyk <20>esk<73>.
% Ano vid<69>te spr<70>vn<76>, jsou to anglick<63> zkratky. Mysl<73>m si, <20>e nejsou % Ano, vid<69>te spr<70>vn<76>, jsou to anglick<63> zkratky. Mysl<73>m si, <20>e nejsou
% a<> tak za<7A>it<69>, aby se pou<6F><75>vali. Pokud <20>lov<6F>k nezn<7A> cel<65> n<>zvy m<>s<EFBFBD>c<EFBFBD> % a<> tak za<7A>it<69>, aby se pou<6F><75>valy. Pokud <20>lov<6F>k nezn<7A> cel<65> n<>zvy m<>s<EFBFBD>c<EFBFBD>,
% t<><74>ko tyto zkratky odvozuje. % t<><74>ko tyto zkratky odvozuje.
%abmon "<U004A><U0061><U006E>";/ %abmon "<U004A><U0061><U006E>";/
% "<U0046><U0065><U0062>";/ % "<U0046><U0065><U0062>";/

View File

@@ -1,7 +1,7 @@
/* /*
* Copyright (c) 1988, 1993 * Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
@@ -13,7 +13,7 @@
* 4. Neither the name of the University nor the names of its contributors * 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 * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,14 +29,14 @@
/* /*
* Portions Copyright (c) 1993 by Digital Equipment Corporation. * Portions Copyright (c) 1993 by Digital Equipment Corporation.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies, and that * copyright notice and this permission notice appear in all copies, and that
* the name of Digital Equipment Corporation not be used in advertising or * the name of Digital Equipment Corporation not be used in advertising or
* publicity pertaining to distribution of the document or software without * publicity pertaining to distribution of the document or software without
* specific, written prior permission. * specific, written prior permission.
* *
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT * 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 * for the name, and "." is not on the search list, then try an as-is
* query now. * 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) if (statp->options & RES_NOALIASES)
return (NULL); return (NULL);
file = __secure_getenv("HOSTALIASES"); file = getenv("HOSTALIASES");
if (file == NULL || (fp = fopen(file, "r")) == NULL) if (file == NULL || (fp = fopen(file, "r")) == NULL)
return (NULL); return (NULL);
setbuf(fp, NULL); setbuf(fp, NULL);

View File

@@ -1,6 +1,7 @@
/* Environment variable to be removed for SUID programs. */ /* Environment variable to be removed for SUID programs. */
#define UNSECURE_ENVVARS \ #define UNSECURE_ENVVARS \
"GCONV_PATH", \ "GCONV_PATH", \
"HOSTALIASES", \
"LOCALDOMAIN", \ "LOCALDOMAIN", \
"LOCPATH", \ "LOCPATH", \
"MALLOC_TRACE", \ "MALLOC_TRACE", \