From b9b026c9c00db1a1b5b4a3caa28162655a04a882 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 27 Apr 2016 16:12:32 +0200 Subject: [PATCH] resolv, nss_dns: Remove remaining syslog logging [BZ #19862] The fix for bug 14841 only removed part of the logging. --- ChangeLog | 10 ++++++++++ resolv/gethnamaddr.c | 20 -------------------- resolv/nss_dns/dns-host.c | 22 ---------------------- 3 files changed, 10 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index a165b0a4bd..77db39e491 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2016-04-27 Florian Weimer + + [BZ #19862] + * resolv/nss_dns/dns-host.c (AskedForGot): Remove. + (getanswer_r): Do not call syslog. + (gaih_getanswer_slice): Likewise. + * resolv/gethnamaddr.c (AskedForGot): Remove. + (getanswer): Do not call syslog. + (gethostbyaddr): Likewise. + 2016-04-27 Joseph Myers * conform/data/signal.h-data (union sigval): Expect also if diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c index 3a8e9b1490..4720fc84a4 100644 --- a/resolv/gethnamaddr.c +++ b/resolv/gethnamaddr.c @@ -70,7 +70,6 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #include #include #include -#include #define RESOLVSORT @@ -100,9 +99,6 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #define MAXALIASES 35 #define MAXADDRS 35 -static const char AskedForGot[] = - "gethostby*.getanswer: asked for \"%s\", got \"%s\""; - static char *h_addr_ptrs[MAXADDRS + 1]; static struct hostent host; @@ -335,20 +331,12 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype) * uses many different types in responses that do not * match QTYPE. */ - if ((_res.options & RES_USE_DNSSEC) == 0) { - syslog(LOG_NOTICE|LOG_AUTH, - "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"", - qname, p_class(C_IN), p_type(qtype), - p_type(type)); - } cp += n; continue; /* XXX - had_error++ ? */ } switch (type) { case T_PTR: if (strcasecmp(tname, bp) != 0) { - syslog(LOG_NOTICE|LOG_AUTH, - AskedForGot, qname, bp); cp += n; continue; /* XXX - had_error++ ? */ } @@ -397,8 +385,6 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype) case T_A: case T_AAAA: if (strcasecmp(host.h_name, bp) != 0) { - syslog(LOG_NOTICE|LOG_AUTH, - AskedForGot, host.h_name, bp); cp += n; continue; /* XXX - had_error++ ? */ } @@ -740,9 +726,6 @@ gethostbyaddr (const void *addr, socklen_t len, int af) _res.options &= ~RES_DNSRCH; _res.options |= RES_DEFNAMES; if (!(rhp = gethostbyname(hname2))) { - syslog(LOG_NOTICE|LOG_AUTH, - "gethostbyaddr: No A record for %s (verifying [%s])", - hname2, inet_ntoa(*((struct in_addr *)addr))); _res.options = old_options; __set_h_errno (HOST_NOT_FOUND); return (NULL); @@ -752,9 +735,6 @@ gethostbyaddr (const void *addr, socklen_t len, int af) if (!memcmp(*haddr, addr, INADDRSZ)) break; if (!*haddr) { - syslog(LOG_NOTICE|LOG_AUTH, - "gethostbyaddr: A record of %s != PTR record [%s]", - hname2, inet_ntoa(*((struct in_addr *)addr))); __set_h_errno (HOST_NOT_FOUND); return (NULL); } diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index 4bb0e6268a..fb1d21cad7 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -78,7 +78,6 @@ #include #include #include -#include #include "nsswitch.h" @@ -99,10 +98,6 @@ #endif #define MAXHOSTNAMELEN 256 -static const char AskedForGot[] = "\ -gethostby*.getanswer: asked for \"%s\", got \"%s\""; - - /* We need this time later. */ typedef union querybuf { @@ -838,14 +833,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, have_to_map = 1; else if (__glibc_unlikely (type != qtype)) { - /* Log a low priority message if we get an unexpected record, but - skip it if we are using DNSSEC since it uses many different types - in responses that do not match QTYPE. */ - if ((_res.options & RES_USE_DNSSEC) == 0) - syslog (LOG_NOTICE | LOG_AUTH, - "gethostby*.getanswer: asked for \"%s %s %s\", " - "got type \"%s\"", - qname, p_class (C_IN), p_type (qtype), p_type (type)); cp += n; continue; /* XXX - had_error++ ? */ } @@ -855,7 +842,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, case T_PTR: if (__glibc_unlikely (strcasecmp (tname, bp) != 0)) { - syslog (LOG_NOTICE | LOG_AUTH, AskedForGot, qname, bp); cp += n; continue; /* XXX - had_error++ ? */ } @@ -899,7 +885,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, case T_AAAA: if (__builtin_expect (strcasecmp (result->h_name, bp), 0) != 0) { - syslog (LOG_NOTICE | LOG_AUTH, AskedForGot, result->h_name, bp); cp += n; continue; /* XXX - had_error++ ? */ } @@ -1152,13 +1137,6 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname, || __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. - - 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)); cp += n; continue; }