(getanswer_r): Fail with NSS_STATUS_NOTFOUND if the server replied
authordrepper <drepper>
Mon, 15 Oct 2007 16:30:01 +0000 (16:30 +0000)
committerdrepper <drepper>
Mon, 15 Oct 2007 16:30:01 +0000 (16:30 +0000)
with only a CNAME and no address record to T_A/T_AAAA requests.

resolv/nss_dns/dns-host.c

index cf060be..0e25564 100644 (file)
@@ -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);
 }