diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | resolv/nss_dns/dns-host.c | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 89156b9497..ba3d6ea6e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-15 Ulrich Drepper <drepper@redhat.com> + + [BZ #3425] + * resolv/nss_dns/dns-host.c (getanswer_r): Fail with + NSS_STATUS_NOTFOUND if the server replied with only a CNAME and no + address record to T_A/T_AAAA requests. + 2007-10-14 Ulrich Drepper <drepper@redhat.com> * posix/glob.c: Reimplement link_exists_p to use fstatat64. 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); } |