diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-10-17 20:24:59 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-10-17 20:24:59 +0000 |
| commit | e2ff293ba10d38af29b08307d6bf90d11143596f (patch) | |
| tree | 4f57da23acb1a50b8fcc4940d173195fd44d21d3 /resolv/nss_dns | |
| parent | 378e8bab9688c447e7567b5066ef26482a4fd8f1 (diff) | |
Updated to fedora-glibc-20071017T2007
Diffstat (limited to 'resolv/nss_dns')
| -rw-r--r-- | resolv/nss_dns/dns-host.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index cf060be8ef..0e25564670 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -215,7 +215,7 @@ _nss_dns_gethostbyname3_r (const char *name, int af, struct hostent *result, map = 1; result->h_addrtype = AF_INET; - result->h_length = INADDRSZ;; + result->h_length = INADDRSZ; } status = getanswer_r (host_buffer.buf, n, name, type, result, buffer, buflen, @@ -836,5 +836,9 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, no_recovery: *h_errnop = NO_RECOVERY; *errnop = ENOENT; - return NSS_STATUS_TRYAGAIN; + /* Special case here: if the resolver sent a result but it only + contains a CNAME while we are looking for a T_A or T_AAAA record, + we fail with NOTFOUND instead of TRYAGAIN. */ + return ((qtype == T_A || qtype == T_AAAA) && ap != host_data->aliases + ? NSS_STATUS_NOTFOUND : NSS_STATUS_TRYAGAIN); } |