upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-22 01:10:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor to remove dead code in query_respond_any()

Browse source
This commit is contained in:
Evan Hunt 2018-09-19 12:19:58 -07:00
parent 427e9ca357
commit 8725f57371
2 changed files with 33 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/ns/include/ns/hooks.h
View file

@ -179,7 +179,6 @@ typedef enum {
NS_QUERY_GOT_ANSWER_BEGIN,
NS_QUERY_RESPOND_ANY_BEGIN,
NS_QUERY_RESPOND_ANY_FOUND,
NS_QUERY_RESPOND_ANY_NOT_FOUND,
NS_QUERY_RESPOND_BEGIN,
NS_QUERY_NOTFOUND_BEGIN,
NS_QUERY_PREP_DELEGATION_BEGIN,

81
lib/ns/query.c
View file

@ -6748,6 +6748,7 @@ query_respond_any(query_ctx_t *qctx) {
dns_rdatasetiter_t *rdsiter = NULL;
isc_result_t result;
dns_rdatatype_t onetype = 0; /* type to use for minimal-any */
isc_buffer_t b;
CALL_HOOK(NS_QUERY_RESPOND_ANY_BEGIN, qctx);
@ -6908,58 +6909,42 @@ query_respond_any(query_ctx_t *qctx) {
dns_message_puttempname(qctx->client->message,
&qctx->fname);
}
} else {
CALL_HOOK(NS_QUERY_RESPOND_ANY_NOT_FOUND, qctx);
if (qctx->fname != NULL) {
dns_message_puttempname(qctx->client->message,
&qctx->fname);
}
/*
* No matching rdatasets found in cache. If we were
* searching for RRSIG/SIG, that's probably okay;
* otherwise this is an error condition.
*/
if (qctx->qtype == dns_rdatatype_rrsig ||
qctx->qtype == dns_rdatatype_sig)
{
isc_buffer_t b;
if (!qctx->is_zone) {
qctx->authoritative = false;
qctx->client->attributes &= ~NS_CLIENTATTR_RA;
query_addauth(qctx);
return (ns_query_done(qctx));
}
if (qctx->qtype == dns_rdatatype_rrsig &&
dns_db_issecure(qctx->db)) {
char namebuf[DNS_NAME_FORMATSIZE];
dns_name_format(qctx->client->query.qname,
namebuf,
sizeof(namebuf));
ns_client_log(qctx->client,
DNS_LOGCATEGORY_DNSSEC,
NS_LOGMODULE_QUERY,
ISC_LOG_WARNING,
"missing signature for %s",
namebuf);
}
qctx->fname = ns_client_newname(qctx->client,
qctx->dbuf, &b);
return (query_sign_nodata(qctx));
} else {
CCTRACE(ISC_LOG_ERROR,
"query_respond_any: "
"no matching rdatasets in cache");
result = DNS_R_SERVFAIL;
}
query_addauth(qctx);
return (ns_query_done(qctx));
}
query_addauth(qctx);
/*
* If we're here, no matching rdatasets were found in
* cache. If we were searching for RRSIG/SIG, that
* may be okay, but otherwise something's gone wrong.
*/
INSIST(qctx->qtype == dns_rdatatype_rrsig ||
qctx->qtype == dns_rdatatype_sig);
return (ns_query_done(qctx));
if (qctx->fname != NULL) {
dns_message_puttempname(qctx->client->message,
&qctx->fname);
}
if (!qctx->is_zone) {
qctx->authoritative = false;
qctx->client->attributes &= ~NS_CLIENTATTR_RA;
query_addauth(qctx);
return (ns_query_done(qctx));
}
if (qctx->qtype == dns_rdatatype_rrsig && dns_db_issecure(qctx->db)) {
char namebuf[DNS_NAME_FORMATSIZE];
dns_name_format(qctx->client->query.qname,
namebuf, sizeof(namebuf));
ns_client_log(qctx->client, DNS_LOGCATEGORY_DNSSEC,
NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
"missing signature for %s", namebuf);
}
qctx->fname = ns_client_newname(qctx->client, qctx->dbuf, &b);
return (query_sign_nodata(qctx));
cleanup:
return (result);