[commits] r6338 - in /fsf/trunk/libc: ChangeLog resolv/arpa/nameser_compat.h resolv/nss_dns/dns-host.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jun 11 00:04:08 2008
New Revision: 6338

Log:
Import glibc-mainline for 2008-06-11

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/resolv/arpa/nameser_compat.h
    fsf/trunk/libc/resolv/nss_dns/dns-host.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jun 11 00:04:08 2008
@@ -1,3 +1,9 @@
+2008-06-10  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* 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@xxxxxxxxxx>
 
 	* misc/regexp.h (compile): Use __REPB_PREFIX macro.

Modified: fsf/trunk/libc/resolv/arpa/nameser_compat.h
==============================================================================
--- fsf/trunk/libc/resolv/arpa/nameser_compat.h (original)
+++ fsf/trunk/libc/resolv/arpa/nameser_compat.h Wed Jun 11 00:04:08 2008
@@ -1,6 +1,6 @@
 /* Copyright (c) 1983, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -12,7 +12,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -161,6 +161,7 @@
 #define	T_SRV		ns_t_srv
 #define T_ATMA		ns_t_atma
 #define T_NAPTR		ns_t_naptr
+#define T_DNAME		ns_t_dname
 #define	T_TSIG		ns_t_tsig
 #define	T_IXFR		ns_t_ixfr
 #define T_AXFR		ns_t_axfr

Modified: fsf/trunk/libc/resolv/nss_dns/dns-host.c
==============================================================================
--- fsf/trunk/libc/resolv/nss_dns/dns-host.c (original)
+++ fsf/trunk/libc/resolv/nss_dns/dns-host.c Wed Jun 11 00:04:08 2008
@@ -1072,12 +1072,13 @@
       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));