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 /nis/nss_nisplus/nisplus-rpc.c | |
| parent | 40e15c4da81e899cbb4c6299fd4f48e1b1391115 (diff) | |
| download | glibc-34816665b678a06e096a378303b68d35ff10a693.tar.gz glibc-34816665b678a06e096a378303b68d35ff10a693.tar.xz glibc-34816665b678a06e096a378303b68d35ff10a693.zip | |
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 'nis/nss_nisplus/nisplus-rpc.c')
| -rw-r--r-- | nis/nss_nisplus/nisplus-rpc.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nis/nss_nisplus/nisplus-rpc.c b/nis/nss_nisplus/nisplus-rpc.c index e35d846ed3..8e661baedb 100644 --- a/nis/nss_nisplus/nisplus-rpc.c +++ b/nis/nss_nisplus/nisplus-rpc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. @@ -283,6 +283,7 @@ _nss_nisplus_getrpcbyname_r (const char *name, struct rpcent *rpc, { nis_result *result; char buf[strlen (name) + 255 + tablename_len]; + int olderr = errno; /* Search at first in the alias list, and use the correct name for the next search */ @@ -308,6 +309,8 @@ _nss_nisplus_getrpcbyname_r (const char *name, struct rpcent *rpc, { enum nss_status status = niserr2nss (result->status); + __set_errno (olderr); + nis_freeresult (result); return status; } @@ -324,6 +327,8 @@ _nss_nisplus_getrpcbyname_r (const char *name, struct rpcent *rpc, *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } + + __set_errno (olderr); return NSS_STATUS_NOTFOUND; } return NSS_STATUS_SUCCESS; @@ -346,6 +351,7 @@ _nss_nisplus_getrpcbynumber_r (const int number, struct rpcent *rpc, int parse_res; nis_result *result; char buf[100 + tablename_len]; + int olderr = errno; sprintf (buf, "[number=%d],%s", number, tablename_val); @@ -355,6 +361,8 @@ _nss_nisplus_getrpcbynumber_r (const int number, struct rpcent *rpc, { enum nss_status status = niserr2nss (result->status); + __set_errno (olderr); + nis_freeresult (result); return status; } @@ -372,7 +380,10 @@ _nss_nisplus_getrpcbynumber_r (const int number, struct rpcent *rpc, return NSS_STATUS_TRYAGAIN; } else - return NSS_STATUS_NOTFOUND; + { + __set_errno (olderr); + return NSS_STATUS_NOTFOUND; + } } return NSS_STATUS_SUCCESS; } |