From 72d4ac23660326e76443cf18f0ed8c2e4792d268 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 12 Jun 2008 16:53:43 +0000 Subject: Updated to fedora-glibc-20080612T1619 --- resolv/arpa/nameser_compat.h | 5 +++-- resolv/nss_dns/dns-host.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'resolv') diff --git a/resolv/arpa/nameser_compat.h b/resolv/arpa/nameser_compat.h index 43bcd3affe..8bc6e913dc 100644 --- a/resolv/arpa/nameser_compat.h +++ b/resolv/arpa/nameser_compat.h @@ -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 @@ typedef struct { #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 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)); -- cgit v1.2.3