From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 12 Nov 2008 07:52:20 +0000 (+0000)
Subject: (gaih_getanswer_slice): Don't abort for unknown request types for now.
X-Git-Tag: upstream/2.30~13969
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ba2747432e9b2a8b9fe180c6d8ed04cf8577ff1;p=external%2Fglibc.git

(gaih_getanswer_slice): Don't abort for unknown request types for now.
---

diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 4d43dec..6cbfcb6 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -1083,11 +1083,18 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
 	    }
 	  continue;
 	}
+#if 1
+      // We should not see any types other than those explicitly listed
+      // below.  Some types sent by server seem missing, though.  Just
+      // collect the data for now.
+      if (__builtin_expect (type != T_A && type != T_AAAA, 0))
+#else
       if (__builtin_expect (type == T_SIG, 0)
 	  || __builtin_expect (type == T_KEY, 0)
 	  || __builtin_expect (type == T_NXT, 0)
 	  || __builtin_expect (type == T_PTR, 0)
 	  || __builtin_expect (type == T_DNAME, 0))
+#endif
 	{
 	  /* We don't support DNSSEC yet.  For now, ignore the record
 	     and send a low priority message to syslog.