From: Ulrich Drepper Date: Tue, 18 Feb 2003 04:03:36 +0000 (+0000) Subject: Update. X-Git-Tag: cvs/glibc-2_3_2~127 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cfe49db2535beb7ef865462c8655b6af9bc20bd;p=thirdparty%2Fglibc.git Update. * nss/getXXbyYY_r.c (REENTRANT_NAME): Return 0 is no entry has been found. --- diff --git a/ChangeLog b/ChangeLog index fcaa26c98d1..f9aeb9ad568 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-02-17 Ulrich Drepper + * nss/getXXbyYY_r.c (REENTRANT_NAME): Return 0 is no entry has + been found. + * sysdeps/posix/sysconf.c (__sysconf): Test for LOGIN_NAME_MAX and TTY_NAME_MAX and not the _POSIX_* minimal value macros. * sysdeps/unix/sysv/linux/bits/local_lim.h: Define TTY_NAME_MAX diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index 5bb28f71415..ba6ffeb7a50 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,97,98,99,2000,2001,2002 Free Software Foundation, Inc. +/* Copyright (C) 1996-2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -247,8 +247,7 @@ done: #ifdef POSTPROCESS POSTPROCESS; #endif - return (status == NSS_STATUS_SUCCESS ? 0 - : status != NSS_STATUS_TRYAGAIN ? ENOENT + return (status != NSS_STATUS_TRYAGAIN ? 0 #ifdef NEED_H_ERRNO /* These functions only set errno if h_errno is NETDB_INTERNAL. */ : *h_errnop != NETDB_INTERNAL ? EAGAIN @@ -269,7 +268,7 @@ OLD (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer, int ret = INTERNAL (REENTRANT_NAME) (ADD_VARIABLES, resbuf, buffer, buflen, result H_ERRNO_VAR); - if (ret != 0) + if (ret != 0 || result == NULL) ret = -1; return ret;