Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-20 02:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix logging in cf5984367b

Browse Source
This commit is contained in:
Simon Kelley
2018-10-23 23:45:57 +01:00
parent cf5984367b
commit cbb5b17ad8
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/rfc1035.c
View File

@@ -1335,7 +1335,6 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
{ {
unsigned long ttl = daemon->local_ttl; unsigned long ttl = daemon->local_ttl;
int ok = 1; int ok = 1;
log_query(F_CONFIG | F_RRNAME, name, NULL, "<TXT>");
#ifndef NO_ID #ifndef NO_ID
/* Dynamically generate stat record */ /* Dynamically generate stat record */
if (t->stat != 0) if (t->stat != 0)
@@ -1345,11 +1344,14 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
ok = 0; ok = 0;
} }
#endif #endif
if (ok && add_resource_record(header, limit, &trunc, nameoffset, &ansp, if (ok)
ttl, NULL, {
T_TXT, t->class, "t", t->len, t->txt)) log_query(F_CONFIG | F_RRNAME, name, NULL, "<TXT>");
anscount++; if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
ttl, NULL,
T_TXT, t->class, "t", t->len, t->txt))
anscount++;
}
} }
} }
} }
@@ -1357,12 +1359,19 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
if (qclass == C_CHAOS) if (qclass == C_CHAOS)
{ {
/* don't forward *.bind and *.server chaos queries */ /* don't forward *.bind and *.server chaos queries - always reply with NOTIMP */
if (hostname_issubdomain("bind", name) || hostname_issubdomain("server", name)) if (hostname_issubdomain("bind", name) || hostname_issubdomain("server", name))
{ {
if (!ans) if (!ans)
notimp = 1, auth = 0; {
ans = 1; notimp = 1, auth = 0;
if (!dryrun)
{
addr.addr.rcode.rcode = NOTIMP;
log_query(F_CONFIG | F_RCODE, name, &addr, NULL);
}
ans = 1;
}
} }
} }