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 /resolv/nss_dns/dns-host.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 'resolv/nss_dns/dns-host.c')
| -rw-r--r-- | resolv/nss_dns/dns-host.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index fafe3435c0..c7bfc13aab 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -137,6 +137,7 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result, int size, type, n; const char *cp; int map = 0; + int olderr = errno; if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1) return NSS_STATUS_UNAVAIL; @@ -175,7 +176,10 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result, enum nss_status status = (errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND); *h_errnop = h_errno; - *errnop = h_errno == TRY_AGAIN ? EAGAIN : ENOENT; + if (h_errno == TRY_AGAIN) + *errnop = EAGAIN; + else + __set_errno (olderr); /* If we are looking for a IPv6 address and mapping is enabled by having the RES_USE_INET6 bit in _res.options set, we try @@ -236,6 +240,7 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af, char qbuf[MAXDNAME+1], *qp = NULL; size_t size; int n, status; + int olderr = errno; if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1) return NSS_STATUS_UNAVAIL; @@ -300,7 +305,7 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af, if (n < 0) { *h_errnop = h_errno; - *errnop = errno; + __set_errno (olderr); return errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND; } @@ -443,7 +448,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, if (__builtin_expect (qdcount, 1) != 1) { *h_errnop = NO_RECOVERY; - *errnop = ENOENT; return NSS_STATUS_UNAVAIL; } if (sizeof (struct host_data) + (ancount + 1) * sizeof (char *) >= buflen) |