Commit 11463c0a authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] clean up gcc -Wshadow warnings

4039.	[cleanup]	Cleaned up warnings from gcc -Wshadow. [RT #37381]
parent cc0a48a3
4039. [cleanup] Cleaned up warnings from gcc -Wshadow. [RT #37381]
4038. [bug] Add 'rpz' flag to node and use it to determine whether 4038. [bug] Add 'rpz' flag to node and use it to determine whether
to call dns_rpz_delete. This should prevent unbalanced to call dns_rpz_delete. This should prevent unbalanced
add / delete calls. [RT #36888] add / delete calls. [RT #36888]
......
...@@ -447,8 +447,6 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner, ...@@ -447,8 +447,6 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner,
result == ISC_R_SUCCESS; result == ISC_R_SUCCESS;
result = dns_rdataset_next(rdataset)) result = dns_rdataset_next(rdataset))
{ {
isc_region_t r;
if ((rdataset->attributes & if ((rdataset->attributes &
DNS_RDATASETATTR_NEGATIVE) != 0) DNS_RDATASETATTR_NEGATIVE) != 0)
continue; continue;
...@@ -462,14 +460,12 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner, ...@@ -462,14 +460,12 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner,
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
break; break;
isc_buffer_availableregion(&target, &r); if (isc_buffer_availablelength(&target) < 1) {
if (r.length < 1) {
result = ISC_R_NOSPACE; result = ISC_R_NOSPACE;
break; break;
} }
r.base[0] = '\n'; isc_buffer_putstr(&target, "\n");
isc_buffer_add(&target, 1);
dns_rdata_reset(&rdata); dns_rdata_reset(&rdata);
} }
......
...@@ -1180,10 +1180,9 @@ parse_hmac(const char *hmac) { ...@@ -1180,10 +1180,9 @@ parse_hmac(const char *hmac) {
*/ */
static isc_result_t static isc_result_t
read_confkey(void) { read_confkey(void) {
isc_log_t *lctx = NULL;
cfg_parser_t *pctx = NULL; cfg_parser_t *pctx = NULL;
cfg_obj_t *file = NULL; cfg_obj_t *file = NULL;
const cfg_obj_t *key = NULL; const cfg_obj_t *keyobj = NULL;
const cfg_obj_t *secretobj = NULL; const cfg_obj_t *secretobj = NULL;
const cfg_obj_t *algorithmobj = NULL; const cfg_obj_t *algorithmobj = NULL;
const char *keyname; const char *keyname;
...@@ -1194,7 +1193,7 @@ read_confkey(void) { ...@@ -1194,7 +1193,7 @@ read_confkey(void) {
if (! isc_file_exists(keyfile)) if (! isc_file_exists(keyfile))
return (ISC_R_FILENOTFOUND); return (ISC_R_FILENOTFOUND);
result = cfg_parser_create(mctx, lctx, &pctx); result = cfg_parser_create(mctx, NULL, &pctx);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
...@@ -1203,16 +1202,16 @@ read_confkey(void) { ...@@ -1203,16 +1202,16 @@ read_confkey(void) {
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
result = cfg_map_get(file, "key", &key); result = cfg_map_get(file, "key", &keyobj);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
(void) cfg_map_get(key, "secret", &secretobj); (void) cfg_map_get(keyobj, "secret", &secretobj);
(void) cfg_map_get(key, "algorithm", &algorithmobj); (void) cfg_map_get(keyobj, "algorithm", &algorithmobj);
if (secretobj == NULL || algorithmobj == NULL) if (secretobj == NULL || algorithmobj == NULL)
fatal("key must have algorithm and secret"); fatal("key must have algorithm and secret");
keyname = cfg_obj_asstring(cfg_map_getname(key)); keyname = cfg_obj_asstring(cfg_map_getname(keyobj));
secretstr = cfg_obj_asstring(secretobj); secretstr = cfg_obj_asstring(secretobj);
algorithm = cfg_obj_asstring(algorithmobj); algorithm = cfg_obj_asstring(algorithmobj);
...@@ -1570,14 +1569,14 @@ save_opt(dig_lookup_t *lookup, char *code, char *value) { ...@@ -1570,14 +1569,14 @@ save_opt(dig_lookup_t *lookup, char *code, char *value) {
*/ */
static void static void
add_opt(dns_message_t *msg, isc_uint16_t udpsize, isc_uint16_t edns, add_opt(dns_message_t *msg, isc_uint16_t udpsize, isc_uint16_t edns,
unsigned int flags, dns_ednsopt_t *ednsopts, size_t count) unsigned int flags, dns_ednsopt_t *opts, size_t count)
{ {
dns_rdataset_t *rdataset = NULL; dns_rdataset_t *rdataset = NULL;
isc_result_t result; isc_result_t result;
debug("add_opt()"); debug("add_opt()");
result = dns_message_buildopt(msg, &rdataset, edns, udpsize, flags, result = dns_message_buildopt(msg, &rdataset, edns, udpsize, flags,
ednsopts, count); opts, count);
check_result(result, "dns_message_buildopt"); check_result(result, "dns_message_buildopt");
result = dns_message_setopt(msg, rdataset); result = dns_message_setopt(msg, rdataset);
check_result(result, "dns_message_setopt"); check_result(result, "dns_message_setopt");
...@@ -2172,10 +2171,10 @@ insert_soa(dig_lookup_t *lookup) { ...@@ -2172,10 +2171,10 @@ insert_soa(dig_lookup_t *lookup) {
#ifdef ISC_PLATFORM_USESIT #ifdef ISC_PLATFORM_USESIT
static void static void
compute_cookie(unsigned char *cookie, size_t len) { compute_cookie(unsigned char *clientcookie, size_t len) {
/* XXXMPA need to fix, should be per server. */ /* XXXMPA need to fix, should be per server. */
INSIST(len >= 8U); INSIST(len >= 8U);
memmove(cookie, cookie_secret, 8); memmove(clientcookie, cookie_secret, 8);
} }
#endif #endif
...@@ -2372,7 +2371,6 @@ setup_lookup(dig_lookup_t *lookup) { ...@@ -2372,7 +2371,6 @@ setup_lookup(dig_lookup_t *lookup) {
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
dns_message_puttempname(lookup->sendmsg, dns_message_puttempname(lookup->sendmsg,
&lookup->name); &lookup->name);
isc_buffer_init(&b, store, MXNAME);
fatal("'%s' is not a legal name " fatal("'%s' is not a legal name "
"(%s)", lookup->textname, "(%s)", lookup->textname,
isc_result_totext(result)); isc_result_totext(result));
...@@ -2497,7 +2495,6 @@ setup_lookup(dig_lookup_t *lookup) { ...@@ -2497,7 +2495,6 @@ setup_lookup(dig_lookup_t *lookup) {
struct sockaddr_in *sin; struct sockaddr_in *sin;
struct sockaddr_in6 *sin6; struct sockaddr_in6 *sin6;
size_t addrl; size_t addrl;
isc_buffer_t b;
sa = &lookup->ecs_addr->type.sa; sa = &lookup->ecs_addr->type.sa;
prefixlen = lookup->ecs_addr->length; prefixlen = lookup->ecs_addr->length;
...@@ -2537,8 +2534,6 @@ setup_lookup(dig_lookup_t *lookup) { ...@@ -2537,8 +2534,6 @@ setup_lookup(dig_lookup_t *lookup) {
INSIST(i < DNS_EDNSOPTIONS); INSIST(i < DNS_EDNSOPTIONS);
opts[i].code = DNS_OPT_SIT; opts[i].code = DNS_OPT_SIT;
if (lookup->sitvalue != NULL) { if (lookup->sitvalue != NULL) {
isc_buffer_t b;
isc_buffer_init(&b, sitbuf, sizeof(sitbuf)); isc_buffer_init(&b, sitbuf, sizeof(sitbuf));
result = isc_hex_decodestring(lookup->sitvalue, result = isc_hex_decodestring(lookup->sitvalue,
&b); &b);
...@@ -3888,7 +3883,7 @@ recv_done(isc_task_t *task, isc_event_t *event) { ...@@ -3888,7 +3883,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
#endif #endif
printmessage(query, msg, ISC_TRUE); printmessage(query, msg, ISC_TRUE);
} else if (l->trace) { } else if (l->trace) {
int n = 0; int nl = 0;
int count = msg->counts[DNS_SECTION_ANSWER]; int count = msg->counts[DNS_SECTION_ANSWER];
debug("in TRACE code"); debug("in TRACE code");
...@@ -3899,13 +3894,13 @@ recv_done(isc_task_t *task, isc_event_t *event) { ...@@ -3899,13 +3894,13 @@ recv_done(isc_task_t *task, isc_event_t *event) {
if (l->trace_root || (l->ns_search_only && count > 0)) { if (l->trace_root || (l->ns_search_only && count > 0)) {
if (!l->trace_root) if (!l->trace_root)
l->rdtype = dns_rdatatype_soa; l->rdtype = dns_rdatatype_soa;
n = followup_lookup(msg, query, nl = followup_lookup(msg, query,
DNS_SECTION_ANSWER); DNS_SECTION_ANSWER);
l->trace_root = ISC_FALSE; l->trace_root = ISC_FALSE;
} else if (count == 0) } else if (count == 0)
n = followup_lookup(msg, query, nl = followup_lookup(msg, query,
DNS_SECTION_AUTHORITY); DNS_SECTION_AUTHORITY);
if (n == 0) if (nl == 0)
docancel = ISC_TRUE; docancel = ISC_TRUE;
} else { } else {
debug("in NSSEARCH code"); debug("in NSSEARCH code");
...@@ -3914,12 +3909,12 @@ recv_done(isc_task_t *task, isc_event_t *event) { ...@@ -3914,12 +3909,12 @@ recv_done(isc_task_t *task, isc_event_t *event) {
/* /*
* This is the initial NS query. * This is the initial NS query.
*/ */
int n; int nl;
l->rdtype = dns_rdatatype_soa; l->rdtype = dns_rdatatype_soa;
n = followup_lookup(msg, query, nl = followup_lookup(msg, query,
DNS_SECTION_ANSWER); DNS_SECTION_ANSWER);
if (n == 0) if (nl == 0)
docancel = ISC_TRUE; docancel = ISC_TRUE;
l->trace_root = ISC_FALSE; l->trace_root = ISC_FALSE;
usesearch = ISC_FALSE; usesearch = ISC_FALSE;
...@@ -4049,12 +4044,12 @@ recv_done(isc_task_t *task, isc_event_t *event) { ...@@ -4049,12 +4044,12 @@ recv_done(isc_task_t *task, isc_event_t *event) {
* routines, since they may be using a non-DNS system for these lookups. * routines, since they may be using a non-DNS system for these lookups.
*/ */
isc_result_t isc_result_t
get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr) { get_address(char *host, in_port_t myport, isc_sockaddr_t *sockaddr) {
int count; int count;
isc_result_t result; isc_result_t result;
isc_app_block(); isc_app_block();
result = bind9_getaddresses(host, port, sockaddr, 1, &count); result = bind9_getaddresses(host, myport, sockaddr, 1, &count);
isc_app_unblock(); isc_app_unblock();
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
return (result); return (result);
......
...@@ -255,7 +255,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid, ...@@ -255,7 +255,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid,
isc_result_t result, loopresult; isc_result_t result, loopresult;
isc_region_t r; isc_region_t r;
dns_name_t empty_name; dns_name_t empty_name;
char t[4096]; char tbuf[4096];
isc_boolean_t first; isc_boolean_t first;
isc_boolean_t no_rdata; isc_boolean_t no_rdata;
...@@ -279,7 +279,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid, ...@@ -279,7 +279,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid,
name = NULL; name = NULL;
dns_message_currentname(msg, sectionid, &name); dns_message_currentname(msg, sectionid, &name);
isc_buffer_init(&target, t, sizeof(t)); isc_buffer_init(&target, tbuf, sizeof(tbuf));
first = ISC_TRUE; first = ISC_TRUE;
print_name = name; print_name = name;
...@@ -370,13 +370,13 @@ printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner, ...@@ -370,13 +370,13 @@ printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner,
isc_buffer_t target; isc_buffer_t target;
isc_result_t result; isc_result_t result;
isc_region_t r; isc_region_t r;
char t[4096]; char tbuf[4096];
UNUSED(msg); UNUSED(msg);
if (headers) if (headers)
printf(";; %s SECTION:\n", set_name); printf(";; %s SECTION:\n", set_name);
isc_buffer_init(&target, t, sizeof(t)); isc_buffer_init(&target, tbuf, sizeof(tbuf));
result = dns_rdataset_totext(rdataset, owner, ISC_FALSE, ISC_FALSE, result = dns_rdataset_totext(rdataset, owner, ISC_FALSE, ISC_FALSE,
&target); &target);
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dig.h,v 1.114 2011/12/07 17:23:28 each Exp $ */
#ifndef DIG_H #ifndef DIG_H
#define DIG_H #define DIG_H
...@@ -274,7 +272,6 @@ extern isc_boolean_t check_ra, have_ipv4, have_ipv6, specified_source, ...@@ -274,7 +272,6 @@ extern isc_boolean_t check_ra, have_ipv4, have_ipv6, specified_source,
extern in_port_t port; extern in_port_t port;
extern unsigned int timeout; extern unsigned int timeout;
extern isc_mem_t *mctx; extern isc_mem_t *mctx;
extern dns_messageid_t id;
extern int sendcount; extern int sendcount;
extern int ndots; extern int ndots;
extern int lookup_counter; extern int lookup_counter;
......
...@@ -425,13 +425,12 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { ...@@ -425,13 +425,12 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
puts(""); puts("");
if (!short_form) { if (!short_form) {
isc_boolean_t headers = ISC_TRUE;
puts("------------"); puts("------------");
/* detailheader(query, msg);*/ /* detailheader(query, msg);*/
detailsection(query, msg, headers, DNS_SECTION_QUESTION); detailsection(query, msg, ISC_TRUE, DNS_SECTION_QUESTION);
detailsection(query, msg, headers, DNS_SECTION_ANSWER); detailsection(query, msg, ISC_TRUE, DNS_SECTION_ANSWER);
detailsection(query, msg, headers, DNS_SECTION_AUTHORITY); detailsection(query, msg, ISC_TRUE, DNS_SECTION_AUTHORITY);
detailsection(query, msg, headers, DNS_SECTION_ADDITIONAL); detailsection(query, msg, ISC_TRUE, DNS_SECTION_ADDITIONAL);
puts("------------"); puts("------------");
} }
......
...@@ -496,7 +496,7 @@ main(int argc, char **argv) { ...@@ -496,7 +496,7 @@ main(int argc, char **argv) {
isc_result_totext(result)); isc_result_totext(result));
isc_entropy_stopcallbacksources(ectx); isc_entropy_stopcallbacksources(ectx);
setup_logging(verbose, mctx, &log); setup_logging(mctx, &log);
dns_rdataset_init(&rdataset); dns_rdataset_init(&rdataset);
......
...@@ -387,7 +387,7 @@ main(int argc, char **argv) { ...@@ -387,7 +387,7 @@ main(int argc, char **argv) {
isc_result_totext(result)); isc_result_totext(result));
isc_entropy_stopcallbacksources(ectx); isc_entropy_stopcallbacksources(ectx);
setup_logging(verbose, mctx, &log); setup_logging(mctx, &log);
dns_rdataset_init(&rdataset); dns_rdataset_init(&rdataset);
......
...@@ -331,7 +331,7 @@ main(int argc, char **argv) { ...@@ -331,7 +331,7 @@ main(int argc, char **argv) {
fatal("could not initialize dst: %s", fatal("could not initialize dst: %s",
isc_result_totext(ret)); isc_result_totext(ret));
setup_logging(verbose, mctx, &log); setup_logging(mctx, &log);
if (predecessor == NULL) { if (predecessor == NULL) {
if (label == NULL) if (label == NULL)
......
...@@ -487,7 +487,7 @@ main(int argc, char **argv) { ...@@ -487,7 +487,7 @@ main(int argc, char **argv) {
fatal("could not initialize dst: %s", fatal("could not initialize dst: %s",
isc_result_totext(ret)); isc_result_totext(ret));
setup_logging(verbose, mctx, &log); setup_logging(mctx, &log);
if (predecessor == NULL) { if (predecessor == NULL) {
if (prepub == -1) if (prepub == -1)
......
...@@ -169,7 +169,7 @@ main(int argc, char **argv) { ...@@ -169,7 +169,7 @@ main(int argc, char **argv) {
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
fatal("Out of memory"); fatal("Out of memory");
setup_logging(verbose, mctx, &log); setup_logging(mctx, &log);
#ifdef PKCS11CRYPTO #ifdef PKCS11CRYPTO
pk11_result_register(); pk11_result_register();
...@@ -343,7 +343,6 @@ main(int argc, char **argv) { ...@@ -343,7 +343,6 @@ main(int argc, char **argv) {
isc_entropy_stopcallbacksources(ectx); isc_entropy_stopcallbacksources(ectx);
if (predecessor != NULL) { if (predecessor != NULL) {
char keystr[DST_KEY_FORMATSIZE];
int major, minor; int major, minor;
if (prepub == -1) if (prepub == -1)
......
...@@ -138,7 +138,7 @@ static isc_mem_t *mctx = NULL; ...@@ -138,7 +138,7 @@ static isc_mem_t *mctx = NULL;
static isc_entropy_t *ectx = NULL; static isc_entropy_t *ectx = NULL;
static dns_ttl_t zone_soa_min_ttl; static dns_ttl_t zone_soa_min_ttl;
static dns_ttl_t soa_ttl; static dns_ttl_t soa_ttl;
static FILE *fp = NULL; static FILE *outfp = NULL;
static char *tempfile = NULL; static char *tempfile = NULL;
static const dns_master_style_t *masterstyle; static const dns_master_style_t *masterstyle;
static dns_masterformat_t inputformat = dns_masterformat_text; static dns_masterformat_t inputformat = dns_masterformat_text;
...@@ -158,7 +158,7 @@ static dns_name_t *gorigin; /* The database origin */ ...@@ -158,7 +158,7 @@ static dns_name_t *gorigin; /* The database origin */
static int nsec3flags = 0; static int nsec3flags = 0;
static dns_iterations_t nsec3iter = 10U; static dns_iterations_t nsec3iter = 10U;
static unsigned char saltbuf[255]; static unsigned char saltbuf[255];
static unsigned char *salt = saltbuf; static unsigned char *gsalt = saltbuf;
static size_t salt_length = 0; static size_t salt_length = 0;
static isc_task_t *master = NULL; static isc_task_t *master = NULL;
static unsigned int ntasks = 0; static unsigned int ntasks = 0;
...@@ -210,7 +210,7 @@ dumpnode(dns_name_t *name, dns_dbnode_t *node) { ...@@ -210,7 +210,7 @@ dumpnode(dns_name_t *name, dns_dbnode_t *node) {
if (!output_dnssec_only) { if (!output_dnssec_only) {
result = dns_master_dumpnodetostream(mctx, gdb, gversion, node, result = dns_master_dumpnodetostream(mctx, gdb, gversion, node,
name, masterstyle, fp); name, masterstyle, outfp);
check_result(result, "dns_master_dumpnodetostream"); check_result(result, "dns_master_dumpnodetostream");
return; return;
} }
...@@ -252,7 +252,7 @@ dumpnode(dns_name_t *name, dns_dbnode_t *node) { ...@@ -252,7 +252,7 @@ dumpnode(dns_name_t *name, dns_dbnode_t *node) {
check_result(result, "dns_master_rdatasettotext"); check_result(result, "dns_master_rdatasettotext");
isc_buffer_usedregion(buffer, &r); isc_buffer_usedregion(buffer, &r);
result = isc_stdio_write(r.base, 1, r.length, fp, NULL); result = isc_stdio_write(r.base, 1, r.length, outfp, NULL);
check_result(result, "isc_stdio_write"); check_result(result, "isc_stdio_write");
isc_buffer_clear(buffer); isc_buffer_clear(buffer);
...@@ -293,8 +293,6 @@ signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dst_key_t *key, ...@@ -293,8 +293,6 @@ signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dst_key_t *key,
mctx, &b, &trdata); mctx, &b, &trdata);
isc_entropy_stopcallbacksources(ectx); isc_entropy_stopcallbacksources(ectx);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
char keystr[DST_KEY_FORMATSIZE];
dst_key_format(key, keystr, sizeof(keystr));
fatal("dnskey '%s' failed to sign data: %s", fatal("dnskey '%s' failed to sign data: %s",
keystr, isc_result_totext(result)); keystr, isc_result_totext(result));
} }
...@@ -744,7 +742,7 @@ hashlist_add(hashlist_t *l, const unsigned char *hash, size_t len) ...@@ -744,7 +742,7 @@ hashlist_add(hashlist_t *l, const unsigned char *hash, size_t len)
static void static void
hashlist_add_dns_name(hashlist_t *l, /*const*/ dns_name_t *name, hashlist_add_dns_name(hashlist_t *l, /*const*/ dns_name_t *name,
unsigned int hashalg, unsigned int iterations, unsigned int hashalg, unsigned int iterations,
const unsigned char *salt, size_t salt_length, const unsigned char *salt, size_t salt_len,
isc_boolean_t speculative) isc_boolean_t speculative)
{ {
char nametext[DNS_NAME_FORMATSIZE]; char nametext[DNS_NAME_FORMATSIZE];
...@@ -753,7 +751,7 @@ hashlist_add_dns_name(hashlist_t *l, /*const*/ dns_name_t *name, ...@@ -753,7 +751,7 @@ hashlist_add_dns_name(hashlist_t *l, /*const*/ dns_name_t *name,
size_t i; size_t i;
len = isc_iterated_hash(hash, hashalg, iterations, len = isc_iterated_hash(hash, hashalg, iterations,
salt, (int)salt_length, salt, (int)salt_len,
name->ndata, name->length); name->ndata, name->length);
if (verbose) { if (verbose) {
dns_name_format(name, nametext, sizeof nametext); dns_name_format(name, nametext, sizeof nametext);
...@@ -835,7 +833,7 @@ hashlist_exists(const hashlist_t *l, ...@@ -835,7 +833,7 @@ hashlist_exists(const hashlist_t *l,
static void static void
addnowildcardhash(hashlist_t *l, /*const*/ dns_name_t *name, addnowildcardhash(hashlist_t *l, /*const*/ dns_name_t *name,
unsigned int hashalg, unsigned int iterations, unsigned int hashalg, unsigned int iterations,
const unsigned char *salt, size_t salt_length) const unsigned char *salt, size_t salt_len)
{ {
dns_fixedname_t fixed; dns_fixedname_t fixed;
dns_name_t *wild; dns_name_t *wild;
...@@ -862,7 +860,7 @@ addnowildcardhash(hashlist_t *l, /*const*/ dns_name_t *name, ...@@ -862,7 +860,7 @@ addnowildcardhash(hashlist_t *l, /*const*/ dns_name_t *name,
fprintf(stderr, "adding no-wildcardhash for %s\n", namestr); fprintf(stderr, "adding no-wildcardhash for %s\n", namestr);
} }
hashlist_add_dns_name(l, wild, hashalg, iterations, salt, salt_length, hashlist_add_dns_name(l, wild, hashalg, iterations, salt, salt_len,
ISC_TRUE); ISC_TRUE);
} }
...@@ -1840,7 +1838,7 @@ nsecify(void) { ...@@ -1840,7 +1838,7 @@ nsecify(void) {
} }
static void static void
addnsec3param(const unsigned char *salt, size_t salt_length, addnsec3param(const unsigned char *salt, size_t salt_len,
dns_iterations_t iterations) dns_iterations_t iterations)
{ {
dns_dbnode_t *node = NULL; dns_dbnode_t *node = NULL;
...@@ -1861,7 +1859,7 @@ addnsec3param(const unsigned char *salt, size_t salt_length, ...@@ -1861,7 +1859,7 @@ addnsec3param(const unsigned char *salt, size_t salt_length,
nsec3param.flags = 0; nsec3param.flags = 0;
nsec3param.hash = unknownalg ? DNS_NSEC3_UNKNOWNALG : dns_hash_sha1; nsec3param.hash = unknownalg ? DNS_NSEC3_UNKNOWNALG : dns_hash_sha1;