diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-08-26 07:06:57 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-08-26 07:06:57 +0000 |
| commit | 34816665b678a06e096a378303b68d35ff10a693 (patch) | |
| tree | 471e49cf229dc64a80a72764e1d2db2c9c6e2818 /hesiod/nss_hesiod/hesiod-pwd.c | |
| parent | 40e15c4da81e899cbb4c6299fd4f48e1b1391115 (diff) | |
| download | glibc-34816665b678a06e096a378303b68d35ff10a693.zip glibc-34816665b678a06e096a378303b68d35ff10a693.tar.gz glibc-34816665b678a06e096a378303b68d35ff10a693.tar.bz2 | |
Update.
* nss/getXXbyYY_r.c (REENTRANT_NAME): Return ENOENT if status is
neither SUCCESS nor TRYAGAIN [PR libc/4259].
* nss/nss_files/files-XXX.c (internal_getent): Don't set *errnop
to ENOENT if no entry is found.
* nis/nss_compat/compat-grp.c: Don't set errno in case of lookup
failure.
* nis/nss_compat/compat-initgroups.c: Likewise.
* nis/nss_compat/compat-pwd.c: Likewise.
* nis/nss_compat/compat-spwd.c: Likewise.
* nis/nss_nis/nis-alias.c: Likewise.
* nis/nss_nis/nis-ethers.c: Likewise.
* nis/nss_nis/nis-grp.c: Likewise.
* nis/nss_nis/nis-hosts.c: Likewise.
* nis/nss_nis/nis-initgroups.c: Likewise.
* nis/nss_nis/nis-netgrp.c: Likewise.
* nis/nss_nis/nis-network.c: Likewise.
* nis/nss_nis/nis-proto.c: Likewise.
* nis/nss_nis/nis-publickey.c: Likewise.
* nis/nss_nis/nis-pwd.c: Likewise.
* nis/nss_nis/nis-rpc.c: Likewise.
* nis/nss_nis/nis-service.c: Likewise.
* nis/nss_nis/nis-spwd.c: Likewise.
* resolv/nss_dns/dns-host.c: Likewise.
* resolv/nss_dns/dns-network.c: Likewise.
* nis/nss_nisplus/nisplus-alias.c: Save errno around NIS calls.
* nis/nss_nisplus/nisplus-ethers.c: Likewise.
* nis/nss_nisplus/nisplus-grp.c: Likewise.
* nis/nss_nisplus/nisplus-hosts.c: Likewise.
* nis/nss_nisplus/nisplus-network.c: Likewise.
* nis/nss_nisplus/nisplus-proto.c: Likewise.
* nis/nss_nisplus/nisplus-pwd.c: Likewise.
* nis/nss_nisplus/nisplus-rpc.c: Likewise.
* nis/nss_nisplus/nisplus-service.c: Likewise.
* nis/nss_nisplus/nisplus-spwd.c: Likewise.
* hesiod/nss_hesiod/hesiod-pwd.c (lookup): Preserve errno value.
* hesiod/nss_hesiod/hesiod-proto.c (lookup): Likewise.
* hesiod/nss_hesiod/hesiod-grp.c (lookup): Likewise.
* hesiod/nss_hesiod/hesiod-service.c (lookup): Likewise.
Diffstat (limited to 'hesiod/nss_hesiod/hesiod-pwd.c')
| -rw-r--r-- | hesiod/nss_hesiod/hesiod-pwd.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/hesiod/nss_hesiod/hesiod-pwd.c b/hesiod/nss_hesiod/hesiod-pwd.c index 9f57e27..2a7f65e 100644 --- a/hesiod/nss_hesiod/hesiod-pwd.c +++ b/hesiod/nss_hesiod/hesiod-pwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. @@ -55,6 +55,7 @@ lookup (const char *name, const char *type, struct passwd *pwd, char **list; int parse_res; size_t len; + int olderr = errno; context = _nss_hesiod_init (); if (context == NULL) @@ -63,8 +64,10 @@ lookup (const char *name, const char *type, struct passwd *pwd, list = hesiod_resolve (context, name, type); if (list == NULL) { + int err = errno; hesiod_end (context); - return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + __set_errno (olderr); + return err == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; } linebuflen = buffer + buflen - data->linebuffer; @@ -83,7 +86,10 @@ lookup (const char *name, const char *type, struct passwd *pwd, parse_res = _nss_files_parse_pwent (buffer, pwd, data, buflen, errnop); if (parse_res < 1) - return parse_res == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; + { + __set_errno (olderr); + return parse_res == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; + } return NSS_STATUS_SUCCESS; } |