This commit is contained in:
Simon Kelley
2018-10-23 23:45:57 +01:00
parent cf5984367b
commit cbb5b17ad8

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;
int ok = 1;
log_query(F_CONFIG | F_RRNAME, name, NULL, "<TXT>");
#ifndef NO_ID
/* Dynamically generate stat record */
if (t->stat != 0)
@@ -1345,11 +1344,14 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
ok = 0;
}
#endif
if (ok && add_resource_record(header, limit, &trunc, nameoffset, &ansp,
if (ok)
{
log_query(F_CONFIG | F_RRNAME, name, NULL, "<TXT>");
if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
ttl, NULL,
T_TXT, t->class, "t", t->len, t->txt))
anscount++;
}
}
}
}
@@ -1357,14 +1359,21 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
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 (!ans)
{
notimp = 1, auth = 0;
if (!dryrun)
{
addr.addr.rcode.rcode = NOTIMP;
log_query(F_CONFIG | F_RCODE, name, &addr, NULL);
}
ans = 1;
}
}
}
if (qclass == C_IN)
{