Commit 0874abad authored by Mark Andrews's avatar Mark Andrews
Browse files

3069. [cleanup] Silence warnings messages from clang static analysis.

                        [RT #20256]
parent 6c77f400
3069. [cleanup] Silence warnings messages from clang static analysis.
[RT #20256]
3068. [bug] Named failed to build with a OpenSSL without engine 3068. [bug] Named failed to build with a OpenSSL without engine
support. [RT #23473] support. [RT #23473]
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: named-checkconf.c,v 1.54 2010/09/07 01:49:08 marka Exp $ */ /* $Id: named-checkconf.c,v 1.55 2011/03/11 06:11:20 marka Exp $ */
/*! \file */ /*! \file */
...@@ -190,7 +190,7 @@ configure_zone(const char *vclass, const char *view, ...@@ -190,7 +190,7 @@ configure_zone(const char *vclass, const char *view,
if (obj != NULL) if (obj != NULL)
maps[i++] = obj; maps[i++] = obj;
} }
maps[i++] = NULL; maps[i] = NULL;
cfg_map_get(zoptions, "type", &typeobj); cfg_map_get(zoptions, "type", &typeobj);
if (typeobj == NULL) if (typeobj == NULL)
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: ddns-confgen.c,v 1.9 2009/09/29 15:06:05 fdupont Exp $ */ /* $Id: ddns-confgen.c,v 1.10 2011/03/11 06:11:20 marka Exp $ */
/*! \file */ /*! \file */
...@@ -160,6 +160,7 @@ main(int argc, char **argv) { ...@@ -160,6 +160,7 @@ main(int argc, char **argv) {
argc -= isc_commandline_index; argc -= isc_commandline_index;
argv += isc_commandline_index; argv += isc_commandline_index;
POST(argv);
if (self_domain != NULL && zone != NULL) if (self_domain != NULL && zone != NULL)
usage(1); /* -s and -z cannot coexist */ usage(1); /* -s and -z cannot coexist */
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rndc-confgen.c,v 1.5 2009/09/29 15:06:05 fdupont Exp $ */ /* $Id: rndc-confgen.c,v 1.6 2011/03/11 06:11:20 marka Exp $ */
/*! \file */ /*! \file */
...@@ -200,6 +200,7 @@ main(int argc, char **argv) { ...@@ -200,6 +200,7 @@ main(int argc, char **argv) {
argc -= isc_commandline_index; argc -= isc_commandline_index;
argv += isc_commandline_index; argv += isc_commandline_index;
POST(argv);
if (argc > 0) if (argc > 0)
usage(1); usage(1);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dig.c,v 1.241 2011/03/05 23:52:29 tbox Exp $ */ /* $Id: dig.c,v 1.242 2011/03/11 06:11:20 marka Exp $ */
/*! \file */ /*! \file */
...@@ -495,8 +495,6 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { ...@@ -495,8 +495,6 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
if (!query->lookup->comments) if (!query->lookup->comments)
flags |= DNS_MESSAGETEXTFLAG_NOCOMMENTS; flags |= DNS_MESSAGETEXTFLAG_NOCOMMENTS;
result = ISC_R_SUCCESS;
result = isc_buffer_allocate(mctx, &buf, len); result = isc_buffer_allocate(mctx, &buf, len);
check_result(result, "isc_buffer_allocate"); check_result(result, "isc_buffer_allocate");
...@@ -1622,7 +1620,6 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only, ...@@ -1622,7 +1620,6 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
(isc_textregion_t *)&tr); (isc_textregion_t *)&tr);
if (result == ISC_R_SUCCESS && if (result == ISC_R_SUCCESS &&
rdtype == dns_rdatatype_ixfr) { rdtype == dns_rdatatype_ixfr) {
result = DNS_R_UNKNOWN;
fprintf(stderr, ";; Warning, " fprintf(stderr, ";; Warning, "
"ixfr requires a " "ixfr requires a "
"serial number\n"); "serial number\n");
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dighost.c,v 1.339 2011/02/25 23:11:13 each Exp $ */ /* $Id: dighost.c,v 1.340 2011/03/11 06:11:20 marka Exp $ */
/*! \file /*! \file
* \note * \note
...@@ -1804,17 +1804,25 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) ...@@ -1804,17 +1804,25 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section)
if (numLookups > 1) { if (numLookups > 1) {
isc_uint32_t i, j; isc_uint32_t i, j;
dig_serverlist_t my_server_list; dig_serverlist_t my_server_list;
dig_server_t *next;
ISC_LIST_INIT(my_server_list); ISC_LIST_INIT(my_server_list);
for (i = numLookups; i > 0; i--) { i = numLookups;
for (srv = ISC_LIST_HEAD(lookup->my_server_list);
srv != NULL;
srv = ISC_LIST_HEAD(lookup->my_server_list)) {
INSIST(i > 0);
isc_random_get(&j); isc_random_get(&j);
j %= i; j %= i;
srv = ISC_LIST_HEAD(lookup->my_server_list); next = ISC_LIST_NEXT(srv, link);
while (j-- > 0) while (j-- > 0 && next != NULL) {
srv = ISC_LIST_NEXT(srv, link); srv = next;
next = ISC_LIST_NEXT(srv, link);
}
ISC_LIST_DEQUEUE(lookup->my_server_list, srv, link); ISC_LIST_DEQUEUE(lookup->my_server_list, srv, link);
ISC_LIST_APPEND(my_server_list, srv, link); ISC_LIST_APPEND(my_server_list, srv, link);
i--;
} }
ISC_LIST_APPENDLIST(lookup->my_server_list, ISC_LIST_APPENDLIST(lookup->my_server_list,
my_server_list, link); my_server_list, link);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: host.c,v 1.126 2011/02/21 23:47:44 tbox Exp $ */ /* $Id: host.c,v 1.127 2011/03/11 06:11:20 marka Exp $ */
/*! \file */ /*! \file */
...@@ -521,6 +521,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { ...@@ -521,6 +521,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
if ((msg->flags & DNS_MESSAGEFLAG_CD) != 0) { if ((msg->flags & DNS_MESSAGEFLAG_CD) != 0) {
printf("%scd", did_flag ? " " : ""); printf("%scd", did_flag ? " " : "");
did_flag = ISC_TRUE; did_flag = ISC_TRUE;
POST(did_flag);
} }
printf("; QUERY: %u, ANSWER: %u, " printf("; QUERY: %u, ANSWER: %u, "
"AUTHORITY: %u, ADDITIONAL: %u\n", "AUTHORITY: %u, ADDITIONAL: %u\n",
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-keyfromlabel.c,v 1.32 2010/12/23 04:07:59 marka Exp $ */ /* $Id: dnssec-keyfromlabel.c,v 1.33 2011/03/11 06:11:20 marka Exp $ */
/*! \file */ /*! \file */
...@@ -518,6 +518,9 @@ main(int argc, char **argv) { ...@@ -518,6 +518,9 @@ main(int argc, char **argv) {
{ {
isc_buffer_clear(&buf); isc_buffer_clear(&buf);
ret = dst_key_buildfilename(key, 0, directory, &buf); ret = dst_key_buildfilename(key, 0, directory, &buf);
if (ret != ISC_R_SUCCESS)
fatal("dst_key_buildfilename returned: %s\n",
isc_result_totext(ret));
if (exact) if (exact)
fatal("%s: %s already exists\n", program, filename); fatal("%s: %s already exists\n", program, filename);
...@@ -542,6 +545,9 @@ main(int argc, char **argv) { ...@@ -542,6 +545,9 @@ main(int argc, char **argv) {
isc_buffer_clear(&buf); isc_buffer_clear(&buf);
ret = dst_key_buildfilename(key, 0, NULL, &buf); ret = dst_key_buildfilename(key, 0, NULL, &buf);
if (ret != ISC_R_SUCCESS)
fatal("dst_key_buildfilename returned: %s\n",
isc_result_totext(ret));
printf("%s\n", filename); printf("%s\n", filename);
dst_key_free(&key); dst_key_free(&key);
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-keygen.c,v 1.115 2010/12/23 04:07:59 marka Exp $ */ /* $Id: dnssec-keygen.c,v 1.116 2011/03/11 06:11:20 marka Exp $ */
/*! \file */ /*! \file */
...@@ -975,12 +975,15 @@ main(int argc, char **argv) { ...@@ -975,12 +975,15 @@ main(int argc, char **argv) {
if (verbose > 0) { if (verbose > 0) {
isc_buffer_clear(&buf); isc_buffer_clear(&buf);
dst_key_buildfilename(key, 0, directory, &buf); ret = dst_key_buildfilename(key, 0,
fprintf(stderr, directory, &buf);
"%s: %s already exists, or might " if (ret == ISC_R_SUCCESS)
"collide with another key upon " fprintf(stderr,
"revokation. Generating a new key\n", "%s: %s already exists, or "
program, filename); "might collide with another "
"key upon revokation. "
"Generating a new key\n",
program, filename);
} }
dst_key_free(&key); dst_key_free(&key);
...@@ -1001,6 +1004,9 @@ main(int argc, char **argv) { ...@@ -1001,6 +1004,9 @@ main(int argc, char **argv) {
isc_buffer_clear(&buf); isc_buffer_clear(&buf);
ret = dst_key_buildfilename(key, 0, NULL, &buf); ret = dst_key_buildfilename(key, 0, NULL, &buf);
if (ret != ISC_R_SUCCESS)
fatal("dst_key_buildfilename returned: %s\n",
isc_result_totext(ret));
printf("%s\n", filename); printf("%s\n", filename);
dst_key_free(&key); dst_key_free(&key);
if (prevkey != NULL) if (prevkey != NULL)
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-signzone.c,v 1.269 2011/03/10 13:37:21 fdupont Exp $ */ /* $Id: dnssec-signzone.c,v 1.270 2011/03/11 06:11:20 marka Exp $ */
/*! \file */ /*! \file */
...@@ -479,16 +479,10 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, ...@@ -479,16 +479,10 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name,
char namestr[DNS_NAME_FORMATSIZE]; char namestr[DNS_NAME_FORMATSIZE];
char typestr[TYPE_FORMATSIZE]; char typestr[TYPE_FORMATSIZE];
char sigstr[SIG_FORMATSIZE]; char sigstr[SIG_FORMATSIZE];
isc_stdtime_t expiry;
dns_name_format(name, namestr, sizeof(namestr)); dns_name_format(name, namestr, sizeof(namestr));
type_format(set->type, typestr, sizeof(typestr)); type_format(set->type, typestr, sizeof(typestr));
if (set->type == dns_rdatatype_dnskey)
expiry = dnskey_endtime;
else
expiry = endtime;
ttl = ISC_MIN(set->ttl, endtime - starttime); ttl = ISC_MIN(set->ttl, endtime - starttime);
dns_rdataset_init(&sigset); dns_rdataset_init(&sigset);
...@@ -1543,7 +1537,6 @@ verifyzone(void) { ...@@ -1543,7 +1537,6 @@ verifyzone(void) {
isc_boolean_t done = ISC_FALSE; isc_boolean_t done = ISC_FALSE;
isc_boolean_t first = ISC_TRUE; isc_boolean_t first = ISC_TRUE;
isc_boolean_t goodksk = ISC_FALSE; isc_boolean_t goodksk = ISC_FALSE;
isc_boolean_t goodzsk = ISC_FALSE;
isc_result_t result; isc_result_t result;
unsigned char revoked_ksk[256]; unsigned char revoked_ksk[256];
unsigned char revoked_zsk[256]; unsigned char revoked_zsk[256];
...@@ -1645,7 +1638,6 @@ verifyzone(void) { ...@@ -1645,7 +1638,6 @@ verifyzone(void) {
#endif #endif
if (zsk_algorithms[dnskey.algorithm] != 255) if (zsk_algorithms[dnskey.algorithm] != 255)
zsk_algorithms[dnskey.algorithm]++; zsk_algorithms[dnskey.algorithm]++;
goodzsk = ISC_TRUE;
} else { } else {
if (standby_zsk[dnskey.algorithm] != 255) if (standby_zsk[dnskey.algorithm] != 255)
standby_zsk[dnskey.algorithm]++; standby_zsk[dnskey.algorithm]++;
...@@ -2268,6 +2260,7 @@ addnsec3param(const unsigned char *salt, size_t salt_length, ...@@ -2268,6 +2260,7 @@ addnsec3param(const unsigned char *salt, size_t salt_length,
result = dns_rdata_fromstruct(&rdata, gclass, result = dns_rdata_fromstruct(&rdata, gclass,
dns_rdatatype_nsec3param, dns_rdatatype_nsec3param,
&nsec3param, &b); &nsec3param, &b);
check_result(result, "dns_rdata_fromstruct()");
rdatalist.rdclass = rdata.rdclass; rdatalist.rdclass = rdata.rdclass;
rdatalist.type = rdata.type; rdatalist.type = rdata.type;
rdatalist.covers = 0; rdatalist.covers = 0;
...@@ -2877,7 +2870,7 @@ loadzonekeys(isc_boolean_t preserve_keys, isc_boolean_t load_public) { ...@@ -2877,7 +2870,7 @@ loadzonekeys(isc_boolean_t preserve_keys, isc_boolean_t load_public) {
} }
keyttl = rdataset.ttl; keyttl = rdataset.ttl;
/* Load keys corresponding to the existing DNSKEY RRset */ /* Load keys corresponding to the existing DNSKEY RRset. */
result = dns_dnssec_keylistfromrdataset(gorigin, directory, mctx, result = dns_dnssec_keylistfromrdataset(gorigin, directory, mctx,
&rdataset, &keysigs, &soasigs, &rdataset, &keysigs, &soasigs,
preserve_keys, load_public, preserve_keys, load_public,
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: controlconf.c,v 1.60 2008/07/23 23:27:54 marka Exp $ */ /* $Id: controlconf.c,v 1.61 2011/03/11 06:11:21 marka Exp $ */
/*! \file */ /*! \file */
...@@ -859,7 +859,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) { ...@@ -859,7 +859,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
cfg_obj_log(key, ns_g_lctx, ISC_LOG_WARNING, cfg_obj_log(key, ns_g_lctx, ISC_LOG_WARNING,
"secret for key '%s' on command channel: %s", "secret for key '%s' on command channel: %s",
keyid->keyname, isc_result_totext(result)); keyid->keyname, isc_result_totext(result));
CHECK(result); goto cleanup;
} }
keyid->secret.length = isc_buffer_usedlength(&b); keyid->secret.length = isc_buffer_usedlength(&b);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: interfacemgr.c,v 1.95 2009/01/17 23:47:42 tbox Exp $ */ /* $Id: interfacemgr.c,v 1.96 2011/03/11 06:11:21 marka Exp $ */
/*! \file */ /*! \file */
...@@ -379,7 +379,7 @@ ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, ...@@ -379,7 +379,7 @@ ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
} }
} }
*ifpret = ifp; *ifpret = ifp;
return (ISC_R_SUCCESS); return (result);
cleanup_interface: cleanup_interface:
ISC_LIST_UNLINK(ifp->mgr->interfaces, ifp, link); ISC_LIST_UNLINK(ifp->mgr->interfaces, ifp, link);
...@@ -964,7 +964,6 @@ isc_boolean_t ...@@ -964,7 +964,6 @@ isc_boolean_t
ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr) { ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr) {
isc_sockaddr_t *old; isc_sockaddr_t *old;
old = ISC_LIST_HEAD(mgr->listenon);
for (old = ISC_LIST_HEAD(mgr->listenon); for (old = ISC_LIST_HEAD(mgr->listenon);
old != NULL; old != NULL;
old = ISC_LIST_NEXT(old, link)) old = ISC_LIST_NEXT(old, link))
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: main.c,v 1.182 2011/03/10 23:47:49 tbox Exp $ */ /* $Id: main.c,v 1.183 2011/03/11 06:11:21 marka Exp $ */
/*! \file */ /*! \file */
...@@ -562,6 +562,7 @@ parse_command_line(int argc, char *argv[]) { ...@@ -562,6 +562,7 @@ parse_command_line(int argc, char *argv[]) {
argc -= isc_commandline_index; argc -= isc_commandline_index;
argv += isc_commandline_index; argv += isc_commandline_index;
POST(argv);
if (argc > 0) { if (argc > 0) {
usage(); usage();
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: query.c,v 1.358 2011/03/10 04:36:14 each Exp $ */ /* $Id: query.c,v 1.359 2011/03/11 06:11:21 marka Exp $ */
/*! \file */ /*! \file */
...@@ -1622,6 +1622,7 @@ query_addadditional2(void *arg, dns_name_t *name, dns_rdatatype_t qtype) { ...@@ -1622,6 +1622,7 @@ query_addadditional2(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
need_addname = ISC_FALSE; need_addname = ISC_FALSE;
zone = NULL; zone = NULL;
needadditionalcache = ISC_FALSE; needadditionalcache = ISC_FALSE;
POST(needadditionalcache);
additionaltype = dns_rdatasetadditional_fromauth; additionaltype = dns_rdatasetadditional_fromauth;
dns_name_init(&cfname, NULL); dns_name_init(&cfname, NULL);
...@@ -4283,11 +4284,12 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, ...@@ -4283,11 +4284,12 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype,
* Check rules for the name if this it the first time, * Check rules for the name if this it the first time,
* i.e. we've not been recursing. * i.e. we've not been recursing.
*/ */
result = DNS_R_SERVFAIL;
st->state &= ~(DNS_RPZ_HAVE_IP | DNS_RPZ_HAVE_NSIPv4 | st->state &= ~(DNS_RPZ_HAVE_IP | DNS_RPZ_HAVE_NSIPv4 |
DNS_RPZ_HAVE_NSIPv6 | DNS_RPZ_HAD_NSDNAME); DNS_RPZ_HAVE_NSIPv6 | DNS_RPZ_HAD_NSDNAME);
result = rpz_rewrite_name(client, qtype, client->query.qname, result = rpz_rewrite_name(client, qtype, client->query.qname,
DNS_RPZ_TYPE_QNAME, &rdataset); DNS_RPZ_TYPE_QNAME, &rdataset);
if (result != ISC_R_SUCCESS)
goto cleanup;
if (st->m.policy != DNS_RPZ_POLICY_MISS) if (st->m.policy != DNS_RPZ_POLICY_MISS)
goto cleanup; goto cleanup;
if ((st->state & (DNS_RPZ_HAVE_NSIPv4 | DNS_RPZ_HAVE_NSIPv6 | if ((st->state & (DNS_RPZ_HAVE_NSIPv4 | DNS_RPZ_HAVE_NSIPv6 |
...@@ -4393,9 +4395,10 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, ...@@ -4393,9 +4395,10 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype,
(st->state & DNS_RPZ_HAVE_NSIPv6) != 0 && (st->state & DNS_RPZ_HAVE_NSIPv6) != 0 &&
st->m.type != DNS_RPZ_TYPE_NSDNAME) { st->m.type != DNS_RPZ_TYPE_NSDNAME) {
result = rpz_rewrite_nsip(client, result = rpz_rewrite_nsip(client,
dns_rdatatype_aaaa, dns_rdatatype_aaaa,
&ns.name, &ipdb, version, &ns.name, &ipdb,
&rdataset, resuming); version, &rdataset,
resuming);
} }
dns_rdata_freestruct(&ns); dns_rdata_freestruct(&ns);
if (ipdb != NULL) if (ipdb != NULL)
...@@ -4910,12 +4913,14 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset, ...@@ -4910,12 +4913,14 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset,
break; break;
} }
} }
if (i == count) if (i == count && aaaaok != NULL)
isc_mem_put(client->mctx, aaaaok, isc_mem_put(client->mctx, aaaaok,
sizeof(isc_boolean_t) * count); sizeof(isc_boolean_t) * count);
return (ISC_TRUE); return (ISC_TRUE);
} }
isc_mem_put(client->mctx, aaaaok, sizeof(isc_boolean_t) * count); if (aaaaok != NULL)
isc_mem_put(client->mctx, aaaaok,
sizeof(isc_boolean_t) * count);
return (ISC_FALSE); return (ISC_FALSE);
} }
...@@ -5364,7 +5369,6 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) ...@@ -5364,7 +5369,6 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
dns_name_copy(fname, rpz_st->fname, NULL); dns_name_copy(fname, rpz_st->fname, NULL);
rpz_st->q.result = result; rpz_st->q.result = result;
client->query.attributes |= NS_QUERYATTR_RECURSING; client->query.attributes |= NS_QUERYATTR_RECURSING;
result = ISC_R_SUCCESS;
goto cleanup; goto cleanup;
default: default:
RECURSE_ERROR(rresult); RECURSE_ERROR(rresult);
...@@ -5816,8 +5820,6 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) ...@@ -5816,8 +5820,6 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
goto db_find; goto db_find;
} }
result = DNS_R_NXRRSET;
/* /*
* Look for a NSEC3 record if we don't have a NSEC record. * Look for a NSEC3 record if we don't have a NSEC record.
*/ */
...@@ -5932,10 +5934,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) ...@@ -5932,10 +5934,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
case DNS_R_NXDOMAIN: case DNS_R_NXDOMAIN:
INSIST(is_zone); INSIST(is_zone);
if (!empty_wild && if (!empty_wild &&
redirect(client, fname, rdataset, &node, &db, type)) { redirect(client, fname, rdataset, &node, &db, type))
result = ISC_R_SUCCESS;
break; break;
}
if (dns_rdataset_isassociated(rdataset)) { if (dns_rdataset_isassociated(rdataset)) {