AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolv, nss_dns: Remove remaining syslog logging [BZ #19862]

Browse Source 
The fix for bug 14841 only removed part of the logging.
This commit is contained in:
Florian Weimer 2016-04-27 16:12:32 +02:00
parent 9f57e65c93
commit b9b026c9c0
3 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2016-04-27 Florian Weimer <fweimer@redhat.com>
[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 <joseph@codesourcery.com> 2016-04-27 Joseph Myers <joseph@codesourcery.com>
* conform/data/signal.h-data (union sigval): Expect also if * conform/data/signal.h-data (union sigval): Expect also if

20
resolv/gethnamaddr.c
View File

@ -70,7 +70,6 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
#include <resolv.h> #include <resolv.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <syslog.h>
#define RESOLVSORT #define RESOLVSORT
@ -100,9 +99,6 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
#define MAXALIASES 35 #define MAXALIASES 35
#define MAXADDRS 35 #define MAXADDRS 35
static const char AskedForGot[] =
"gethostby*.getanswer: asked for \"%s\", got \"%s\"";
static char *h_addr_ptrs[MAXADDRS + 1]; static char *h_addr_ptrs[MAXADDRS + 1];
static struct hostent host; 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 * uses many different types in responses that do not
* match QTYPE. * 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; cp += n;
continue; /* XXX - had_error++ ? */ continue; /* XXX - had_error++ ? */
} }
switch (type) { switch (type) {
case T_PTR: case T_PTR:
if (strcasecmp(tname, bp) != 0) { if (strcasecmp(tname, bp) != 0) {
syslog(LOG_NOTICE|LOG_AUTH,
AskedForGot, qname, bp);
cp += n; cp += n;
continue; /* XXX - had_error++ ? */ continue; /* XXX - had_error++ ? */
} }
@ -397,8 +385,6 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype)
case T_A: case T_A:
case T_AAAA: case T_AAAA:
if (strcasecmp(host.h_name, bp) != 0) { if (strcasecmp(host.h_name, bp) != 0) {
syslog(LOG_NOTICE|LOG_AUTH,
AskedForGot, host.h_name, bp);
cp += n; cp += n;
continue; /* XXX - had_error++ ? */ continue; /* XXX - had_error++ ? */
} }
@ -740,9 +726,6 @@ gethostbyaddr (const void *addr, socklen_t len, int af)
_res.options &= ~RES_DNSRCH; _res.options &= ~RES_DNSRCH;
_res.options |= RES_DEFNAMES; _res.options |= RES_DEFNAMES;
if (!(rhp = gethostbyname(hname2))) { 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; _res.options = old_options;
__set_h_errno (HOST_NOT_FOUND); __set_h_errno (HOST_NOT_FOUND);
return (NULL); return (NULL);
@ -752,9 +735,6 @@ gethostbyaddr (const void *addr, socklen_t len, int af)
if (!memcmp(*haddr, addr, INADDRSZ)) if (!memcmp(*haddr, addr, INADDRSZ))
break; break;
if (!*haddr) { 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); __set_h_errno (HOST_NOT_FOUND);
return (NULL); return (NULL);
} }

22
resolv/nss_dns/dns-host.c
View File

@ -78,7 +78,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <sys/syslog.h>
#include "nsswitch.h" #include "nsswitch.h"
@ -99,10 +98,6 @@
#endif #endif
#define MAXHOSTNAMELEN 256 #define MAXHOSTNAMELEN 256
static const char AskedForGot[] = "\
gethostby*.getanswer: asked for \"%s\", got \"%s\"";
/* We need this time later. */ /* We need this time later. */
typedef union querybuf typedef union querybuf
{ {
@ -838,14 +833,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
have_to_map = 1; have_to_map = 1;
else if (__glibc_unlikely (type != qtype)) 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; cp += n;
continue; /* XXX - had_error++ ? */ continue; /* XXX - had_error++ ? */
} }
@ -855,7 +842,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
case T_PTR: case T_PTR:
if (__glibc_unlikely (strcasecmp (tname, bp) != 0)) if (__glibc_unlikely (strcasecmp (tname, bp) != 0))
{ {
syslog (LOG_NOTICE | LOG_AUTH, AskedForGot, qname, bp);
cp += n; cp += n;
continue; /* XXX - had_error++ ? */ continue; /* XXX - had_error++ ? */
} }
@ -899,7 +885,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
case T_AAAA: case T_AAAA:
if (__builtin_expect (strcasecmp (result->h_name, bp), 0) != 0) if (__builtin_expect (strcasecmp (result->h_name, bp), 0) != 0)
{ {
syslog (LOG_NOTICE | LOG_AUTH, AskedForGot, result->h_name, bp);
cp += n; cp += n;
continue; /* XXX - had_error++ ? */ 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)) || __builtin_expect (type == T_DNAME, 0))
#endif #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; cp += n;
continue; continue;
} }