about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-06-10 22:36:45 +0000
committerUlrich Drepper <drepper@redhat.com>2008-06-10 22:36:45 +0000
commitc128355211141f304e9257dc6d16b73ab57a1fd0 (patch)
tree320f16128e8c494debf75e290e057bda44ae24c8
parentc536b04dbc61d7ac4ee5dc7524fb5aeec4c453a3 (diff)
downloadglibc-c128355211141f304e9257dc6d16b73ab57a1fd0.tar.gz
glibc-c128355211141f304e9257dc6d16b73ab57a1fd0.tar.xz
glibc-c128355211141f304e9257dc6d16b73ab57a1fd0.zip
* resolv/nss_dns/dns-host.c (gaih_getanswer_slice): Also log and
	ignore T_DNAME messages.
	* resolv/arpa/nameser_compat.h (T_DNAME): Define.
-rw-r--r--ChangeLog6
-rw-r--r--resolv/nss_dns/dns-host.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ec8d346d45..98ed0b7afb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* resolv/nss_dns/dns-host.c (gaih_getanswer_slice): Also log and
+	ignore T_DNAME messages.
+	* resolv/arpa/nameser_compat.h (T_DNAME): Define.
+
 2008-06-05  Jakub Jelinek  <jakub@redhat.com>
 
 	* misc/regexp.h (compile): Use __REPB_PREFIX macro.
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index d998ebf4f5..f99db1c64f 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -1072,12 +1072,13 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
       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_PTR, 0)
+	  || __builtin_expect (type == T_DNAME, 0))
 	{
 	  /* We don't support DNSSEC yet.  For now, ignore the record
 	     and send a low priority message to syslog.
 
-	     We also don't expect T_PTR messages.  */
+	     We also don't expect T_PTR or T_DNAME messages.  */
 	  syslog (LOG_DEBUG | LOG_AUTH,
 		  "getaddrinfo*.gaih_getanswer: got type \"%s\"",
 		  p_type (type));