upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-12 15:50:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9.20] new: ci: Update Clang to version 20

Browse source 
Backport of MR !10565

Merge branch 'backport-mnowak/llvm-20-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10634
This commit is contained in:
Mark Andrews 2025-06-25 15:02:19 +10:00
commit c360100ab5
47 changed files with 166 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.git-blame-ignore-revs
View file

@ -1548,3 +1548,5 @@ f2fa1b7d63100564dc55463a05bdeed893f83d86
c22176c0f9a71217be9bfab00573f8f0265499af
# Remove redundant parentheses from the return statement
58a15d38c2c321fac75abef389a48ff82deaccf0
# Reformat sources with up-to-date clang-format-20
53738b0e5e0037b7ac8d06e146832d972e2e46d5

2
.gitlab-ci.yml
View file

@ -15,7 +15,7 @@ variables:
TEST_PARALLEL_JOBS: 4
CONFIGURE: ./configure
CLANG_VERSION: 19
CLANG_VERSION: 20
CLANG: "clang-${CLANG_VERSION}"
SCAN_BUILD: "scan-build-${CLANG_VERSION}"
LLVM_SYMBOLIZER: "/usr/lib/llvm-${CLANG_VERSION}/bin/llvm-symbolizer"

2
bin/delv/delv.c
View file

@ -407,7 +407,7 @@ print_status(dns_rdataset_t *rdataset) {
if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) {
strlcat(buf, "negative response", sizeof(buf));
strlcat(buf, (yaml ? "_" : ", "), sizeof(buf));
strlcat(buf, yaml ? "_" : ", ", sizeof(buf));
}
switch (rdataset->trust) {

2
bin/dig/dig.c
View file

@ -2787,7 +2787,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
printgreeting(argc, argv, *lookup);
*firstarg = false;
}
ISC_LIST_APPEND(lookup_list, (*lookup), link);
ISC_LIST_APPEND(lookup_list, *lookup, link);
debug("looking up %s", (*lookup)->textname);
}
return value_from_next;

8
bin/dnssec/dnssec-keygen.c
View file

@ -433,10 +433,10 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) {
fatal("-S and -G cannot be used together");
}
ret = dst_key_fromnamedfile(
ctx->predecessor, ctx->directory,
(DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE),
mctx, &prevkey);
ret = dst_key_fromnamedfile(ctx->predecessor, ctx->directory,
DST_TYPE_PUBLIC | DST_TYPE_PRIVATE |
DST_TYPE_STATE,
mctx, &prevkey);
if (ret != ISC_R_SUCCESS) {
fatal("Invalid keyfile %s: %s", ctx->predecessor,
isc_result_totext(ret));

6
bin/dnssec/dnssec-ksr.c
View file

@ -496,11 +496,11 @@ create_key(ksr_ctx_t *ksr, dns_kasp_t *kasp, dns_kasp_key_t *kaspkey,
dst_key_setbool(key, DST_BOOL_KSK, ksr->ksk);
dst_key_setbool(key, DST_BOOL_ZSK, !ksr->ksk);
dst_key_settime(key, DST_TIME_CREATED, ksr->now);
dst_key_settime(key, DST_TIME_PUBLISH, (active - prepub));
dst_key_settime(key, DST_TIME_PUBLISH, active - prepub);
dst_key_settime(key, DST_TIME_ACTIVATE, active);
if (ksr->ksk) {
dns_keymgr_settime_syncpublish(key, kasp,
(inception == ksr->start));
inception == ksr->start);
}
if (ksr->lifetime > 0) {
@ -516,7 +516,7 @@ create_key(ksr_ctx_t *ksr, dns_kasp_t *kasp, dns_kasp_key_t *kaspkey,
ksr->retiresafety + ksr->signdelay;
}
dst_key_settime(key, DST_TIME_INACTIVE, inactive);
dst_key_settime(key, DST_TIME_DELETE, (inactive + remove));
dst_key_settime(key, DST_TIME_DELETE, inactive + remove);
*expiration = inactive;
} else {
*expiration = 0;

4
bin/named/dlz_dlopen_driver.c
View file

@ -268,13 +268,13 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
cd->dlz_allowzonexfr = (dlz_dlopen_allowzonexfr_t *)dl_load_symbol(
cd, "dlz_allowzonexfr", false);
cd->dlz_allnodes = (dlz_dlopen_allnodes_t *)dl_load_symbol(
cd, "dlz_allnodes", (cd->dlz_allowzonexfr != NULL));
cd, "dlz_allnodes", cd->dlz_allowzonexfr != NULL);
cd->dlz_authority = (dlz_dlopen_authority_t *)dl_load_symbol(
cd, "dlz_authority", false);
cd->dlz_newversion = (dlz_dlopen_newversion_t *)dl_load_symbol(
cd, "dlz_newversion", false);
cd->dlz_closeversion = (dlz_dlopen_closeversion_t *)dl_load_symbol(
cd, "dlz_closeversion", (cd->dlz_newversion != NULL));
cd, "dlz_closeversion", cd->dlz_newversion != NULL);
cd->dlz_configure = (dlz_dlopen_configure_t *)dl_load_symbol(
cd, "dlz_configure", false);
cd->dlz_ssumatch = (dlz_dlopen_ssumatch_t *)dl_load_symbol(

10
bin/named/server.c
View file

@ -4862,12 +4862,10 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
/*
* Resolver.
*/
CHECK(get_view_querysource_dispatch(
maps, AF_INET, &dispatch4,
(ISC_LIST_PREV(view, link) == NULL)));
CHECK(get_view_querysource_dispatch(
maps, AF_INET6, &dispatch6,
(ISC_LIST_PREV(view, link) == NULL)));
CHECK(get_view_querysource_dispatch(maps, AF_INET, &dispatch4,
ISC_LIST_PREV(view, link) == NULL));
CHECK(get_view_querysource_dispatch(maps, AF_INET6, &dispatch6,
ISC_LIST_PREV(view, link) == NULL));
if (dispatch4 == NULL && dispatch6 == NULL) {
UNEXPECTED_ERROR("unable to obtain either an IPv4 or"
" an IPv6 dispatch");

15
bin/tests/system/rpz/testlib/dummylib.c
View file

@ -593,9 +593,8 @@ get_cstr_zones(const char *cstr, trpz_rsp_t *trsp, size_t *pnzones) {
}
if (trsp->num_zones > old_zct) {
result = realloc(result,
((trsp->num_zones + 1) *
sizeof(*result)));
result = realloc(result, (trsp->num_zones +
1) * sizeof(*result));
if (result == NULL) {
perror("realloc");
exit(EXIT_FAILURE);
@ -878,7 +877,7 @@ trpz_rsp_push(librpz_emsg_t *emsg, librpz_rsp_t *rsp) {
}
memmove(&(trsp->rstack[1]), &(trsp->rstack[0]),
(trsp->stack_idx * sizeof(trsp->rstack[0])));
trsp->stack_idx * sizeof(trsp->rstack[0]));
trsp->stack_idx++;
return true;
@ -895,7 +894,7 @@ trpz_rsp_pop(librpz_emsg_t *emsg, librpz_result_t *result, librpz_rsp_t *rsp) {
}
memmove(&(trsp->rstack[0]), &(trsp->rstack[1]),
((trsp->stack_idx - 1) * sizeof(trsp->rstack[0])));
(trsp->stack_idx - 1) * sizeof(trsp->rstack[0]));
memmove(result, &(trsp->rstack[0].result), sizeof(*result));
trsp->stack_idx--;
@ -916,7 +915,7 @@ trpz_rsp_pop_discard(librpz_emsg_t *emsg, librpz_rsp_t *rsp) {
if (trsp->stack_idx > 1) {
memmove(&(trsp->rstack[1]), &(trsp->rstack[2]),
((trsp->stack_idx - 2) * sizeof(trsp->rstack[0])));
(trsp->stack_idx - 2) * sizeof(trsp->rstack[0]));
}
trsp->stack_idx--;
@ -1144,7 +1143,7 @@ domain_cmp(const char *query, const char *record, bool *wildp) {
qptr = query + strlen(query) - (cmplen - 2);
if (strncmp(qptr, rptr, (cmplen - 2)) == 0) {
if (strncmp(qptr, rptr, cmplen - 2) == 0) {
*wildp = true;
return 0;
}
@ -1259,7 +1258,7 @@ result_supercedes_address(const trpz_result_t *new, const trpz_result_t *old) {
return false;
}
if ((new->flags &NODE_FLAG_IPV6_ADDRESS) &&
if ((new->flags & NODE_FLAG_IPV6_ADDRESS) &&
!(old->flags & NODE_FLAG_IPV6_ADDRESS))
{
return true;

16
bin/tests/system/rpz/testlib/test-data.c
View file

@ -169,7 +169,7 @@ get_address_info(const char *astr, int *pfamily, char *pbuf,
*errp = str_printf(
"invalid rpz IP address \"%s\"; "
"invalid prefix length of %u",
(optname ? optname : astr), prefix);
optname ? optname : astr, prefix);
}
return -1;
@ -187,7 +187,7 @@ get_address_info(const char *astr, int *pfamily, char *pbuf,
*errp = str_printf(
"invalid rpz IP address \"%s\"; "
"invalid prefix length of %u",
(optname ? optname : astr), prefix);
optname ? optname : astr, prefix);
}
return -1;
@ -358,7 +358,7 @@ apply_update_to_set(trpz_result_t **results, size_t *pnresults,
/* No match. Instead, append. */
(*pnresults)++;
*results = realloc(*results, (*pnresults * sizeof(**results)));
*results = realloc(*results, *pnresults * sizeof(**results));
if (*results == NULL) {
perror("realloc");
return NULL;
@ -507,7 +507,7 @@ add_other_rr(trpz_result_t *node, const char *rrtype, const char *val,
node->nrrs++;
node->rrs = realloc(node->rrs, (node->nrrs * sizeof(*(node->rrs))));
node->rrs = realloc(node->rrs, node->nrrs * sizeof(*(node->rrs)));
if (node->rrs == NULL) {
perror("realloc");
exit(EXIT_FAILURE);
@ -544,11 +544,11 @@ reverse_labels(const char *str, char *pbuf) {
}
if (sptr == str) {
strncat(pbuf, sptr, (end - sptr));
strncat(pbuf, sptr, end - sptr);
break;
}
strncat(pbuf, sptr + 1, (end - (sptr + 1)));
strncat(pbuf, sptr + 1, end - (sptr + 1));
strcat(pbuf, ".");
end = sptr--;
}
@ -800,7 +800,7 @@ apply_update(const char *updstr, trpz_result_t **presults, size_t *pnresults,
(*pnzones)++;
*pzones = realloc(*pzones, (*pnzones * sizeof(**pzones)));
*pzones = realloc(*pzones, *pnzones * sizeof(**pzones));
if (*pzones == NULL) {
perror("realloc");
exit(EXIT_FAILURE);
@ -1009,7 +1009,7 @@ apply_update(const char *updstr, trpz_result_t **presults, size_t *pnresults,
/* A special case of PASSTHRU (with trailing characters) */
if (nend != NULL &&
(strlen(databuf) == (size_t)(nend - nodebuf)) &&
!strncmp(databuf, nodebuf, (nend - nodebuf)))
!strncmp(databuf, nodebuf, nend - nodebuf))
{
policy = LIBRPZ_POLICY_PASSTHRU;
}

10
lib/dns/adb.c
View file

@ -2670,11 +2670,11 @@ dbfind_name(dns_adbname_t *adbname, isc_stdtime_t now, dns_rdatatype_t rdtype) {
* any matching static-stub zone without looking into the cache to honor
* the configuration on which server we should send queries to.
*/
result =
dns_view_find(adb->view, adbname->name, rdtype, now,
DNS_DBFIND_GLUEOK | DNS_DBFIND_ADDITIONALOK, true,
((adbname->flags & DNS_ADBFIND_STARTATZONE) != 0),
NULL, NULL, fname, &rdataset, NULL);
result = dns_view_find(adb->view, adbname->name, rdtype, now,
DNS_DBFIND_GLUEOK | DNS_DBFIND_ADDITIONALOK,
true,
(adbname->flags & DNS_ADBFIND_STARTATZONE) != 0,
NULL, NULL, fname, &rdataset, NULL);
switch (result) {
case DNS_R_GLUE:

8
lib/dns/byaddr.c
View file

@ -57,10 +57,10 @@ dns_byaddr_createptrname(const isc_netaddr_t *address, dns_name_t *name) {
if (address->family == AF_INET) {
(void)snprintf(textname, sizeof(textname),
"%u.%u.%u.%u.in-addr.arpa.",
((unsigned int)bytes[3] & 0xffU),
((unsigned int)bytes[2] & 0xffU),
((unsigned int)bytes[1] & 0xffU),
((unsigned int)bytes[0] & 0xffU));
(unsigned int)bytes[3] & 0xffU,
(unsigned int)bytes[2] & 0xffU,
(unsigned int)bytes[1] & 0xffU,
(unsigned int)bytes[0] & 0xffU);
} else if (address->family == AF_INET6) {
size_t remaining;

4
lib/dns/dispatch.c
View file

@ -564,7 +564,7 @@ udp_recv(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
dispentry_log(resp, ISC_LOG_DEBUG(92),
"got valid DNS message header, /QR %c, id %u",
(((flags & DNS_MESSAGEFLAG_QR) != 0) ? '1' : '0'), id);
((flags & DNS_MESSAGEFLAG_QR) != 0) ? '1' : '0', id);
/*
* Look at the message flags. If it's a query, ignore it.
@ -668,7 +668,7 @@ tcp_recv_success(dns_dispatch_t *disp, isc_region_t *region,
dispatch_log(disp, ISC_LOG_DEBUG(92),
"got valid DNS message header, /QR %c, id %u",
(((flags & DNS_MESSAGEFLAG_QR) != 0) ? '1' : '0'), id);
((flags & DNS_MESSAGEFLAG_QR) != 0) ? '1' : '0', id);
/*
* Look at the message flags. If it's a query, ignore it and keep

20
lib/dns/dnssec.c
View file

@ -1572,7 +1572,7 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, dns_kasp_t *kasp,
/* Try to read the public key. */
result = keyfromfile(kasp, directory, dnskey,
(DST_TYPE_PUBLIC | DST_TYPE_STATE), mctx,
DST_TYPE_PUBLIC | DST_TYPE_STATE, mctx,
&pubkey);
if (result == ISC_R_FILENOTFOUND || result == ISC_R_NOPERM) {
result = ISC_R_SUCCESS;
@ -1587,10 +1587,10 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, dns_kasp_t *kasp,
}
/* Now read the private key. */
result = keyfromfile(
kasp, directory, dnskey,
(DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE),
mctx, &privkey);
result = keyfromfile(kasp, directory, dnskey,
DST_TYPE_PUBLIC | DST_TYPE_PRIVATE |
DST_TYPE_STATE,
mctx, &privkey);
/*
* If the key was revoked and the private file
@ -1604,9 +1604,9 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, dns_kasp_t *kasp,
dst_key_setflags(dnskey,
flags & ~DNS_KEYFLAG_REVOKE);
result = keyfromfile(kasp, directory, dnskey,
(DST_TYPE_PUBLIC |
DST_TYPE_PRIVATE |
DST_TYPE_STATE),
DST_TYPE_PUBLIC |
DST_TYPE_PRIVATE |
DST_TYPE_STATE,
mctx, &privkey);
if (result == ISC_R_SUCCESS &&
dst_key_pubcompare(dnskey, privkey, false))
@ -1628,8 +1628,8 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, dns_kasp_t *kasp,
result2 = dst_key_getfilename(
dst_key_name(dnskey), dst_key_id(dnskey),
dst_key_alg(dnskey),
(DST_TYPE_PUBLIC | DST_TYPE_PRIVATE |
DST_TYPE_STATE),
DST_TYPE_PUBLIC | DST_TYPE_PRIVATE |
DST_TYPE_STATE,
NULL, mctx, &buf);
if (result2 != ISC_R_SUCCESS) {
char namebuf[DNS_NAME_FORMATSIZE];

21
lib/dns/include/dns/librpz.h
View file

@ -367,7 +367,7 @@ typedef struct librpz_client librpz_client_t;
* @param mutex: pointer to the lock for the client handle
* @param log_ctx: NULL or resolver's context log messages
*/
typedef librpz_clist_t *(librpz_clist_create_t)(librpz_emsg_t *emsg,
typedef librpz_clist_t *(librpz_clist_create_t)(librpz_emsg_t * emsg,
librpz_mutex_t *lock,
librpz_mutex_t *unlock,
librpz_mutex_t *mutex_destroy,
@ -388,7 +388,7 @@ LIBDEF_F(clist_detach)
* @param use_expired: true to not ignore expired zones
* @return client handle or NULL if the handle could not be created
*/
typedef librpz_client_t *(librpz_client_create_t)(librpz_emsg_t *emsg,
typedef librpz_client_t *(librpz_client_create_t)(librpz_emsg_t * emsg,
librpz_clist_t *clist,
const char *cstr,
bool use_expired);
@ -649,8 +649,8 @@ LIBDEF_F(zone_refresh)
* @param client context
* @return malloc'ed string or NULL after error
*/
typedef char *(librpz_db_info_t)(librpz_emsg_t *emsg, bool license, bool cfiles,
bool listens, librpz_rsp_t *rsp);
typedef char *(librpz_db_info_t)(librpz_emsg_t * emsg, bool license,
bool cfiles, bool listens, librpz_rsp_t *rsp);
LIBDEF_F(db_info)
/**
@ -670,7 +670,7 @@ LIBDEF_F(itr_start)
* @param rsp state from librpz_itr_start()
* @return malloc'ed string or NULL after error
*/
typedef char *(librpz_mf_stats_t)(librpz_emsg_t *emsg, librpz_rsp_t *rsp);
typedef char *(librpz_mf_stats_t)(librpz_emsg_t * emsg, librpz_rsp_t *rsp);
LIBDEF_F(mf_stats)
/**
@ -679,7 +679,7 @@ LIBDEF_F(mf_stats)
* @param[in,out] rsp: state from librpz_itr_start()
* @return malloc'ed string or NULL after error
*/
typedef char *(librpz_vers_stats_t)(librpz_emsg_t *emsg, librpz_rsp_t *rsp);
typedef char *(librpz_vers_stats_t)(librpz_emsg_t * emsg, librpz_rsp_t *rsp);
LIBDEF_F(vers_stats)
/**
@ -689,7 +689,7 @@ LIBDEF_F(vers_stats)
* @param[in,out] rsp state from librpz_rsp_start()
* @return malloc'ed string or NULL after error
*/
typedef char *(librpz_itr_zone_t)(librpz_emsg_t *emsg, bool all_zones,
typedef char *(librpz_itr_zone_t)(librpz_emsg_t * emsg, bool all_zones,
librpz_rsp_t *rsp);
LIBDEF_F(itr_zone)
@ -756,11 +756,12 @@ typedef int(librpz_domain_pton2_t)(const char *src, u_char *dst, size_t dstsiz,
LIBDEF_F(domain_pton2)
typedef union socku socku_t;
typedef socku_t *(librpz_mk_inet_su_t)(socku_t *su, const struct in_addr *addrp,
in_port_t port);
typedef socku_t *(librpz_mk_inet_su_t)(socku_t * su,
const struct in_addr *addrp,
in_port_t port);
LIBDEF_F(mk_inet_su)
typedef socku_t *(librpz_mk_inet6_su_t)(socku_t *su,
typedef socku_t *(librpz_mk_inet6_su_t)(socku_t * su,
const struct in6_addr *addrp,
uint32_t scope_id, in_port_t port);
LIBDEF_F(mk_inet6_su)

4
lib/dns/include/dns/rdataslab.h
View file

@ -154,8 +154,10 @@ enum {
DNS_SLABHEADERATTR_STALE_WINDOW = 1 << 13,
};
/* clang-format off : RemoveParentheses */
#define DNS_SLABHEADER_GETATTR(header, attribute) \
(atomic_load_acquire(&(header)->attributes) & attribute)
(atomic_load_acquire(&(header)->attributes) & (attribute))
/* clang-format on */
#define DNS_SLABHEADER_SETATTR(header, attribute) \
atomic_fetch_or_release(&(header)->attributes, attribute)
#define DNS_SLABHEADER_CLRATTR(header, attribute) \

15
lib/dns/keymgr.c
View file

@ -201,7 +201,7 @@ dns_keymgr_settime_syncpublish(dst_key_t *key, dns_kasp_t *kasp, bool first) {
ret = dst_key_getnum(key, DST_NUM_LIFETIME, &lifetime);
if (ret == ISC_R_SUCCESS && lifetime > 0) {
dst_key_settime(key, DST_TIME_SYNCDELETE,
(syncpublish + lifetime));
syncpublish + lifetime);
}
}
@ -298,7 +298,7 @@ keymgr_prepublication_time(dns_dnsseckey_t *key, dns_kasp_t *kasp,
syncpub);
if (klifetime > 0) {
dst_key_settime(key->key, DST_TIME_SYNCDELETE,
(syncpub + klifetime));
syncpub + klifetime);
}
}
}
@ -1640,12 +1640,12 @@ keymgr_key_init(dns_dnsseckey_t *key, dns_kasp_t *kasp, isc_stdtime_t now,
ret = dst_key_getbool(key->key, DST_BOOL_KSK, &ksk);
if (ret != ISC_R_SUCCESS) {
ksk = ((dst_key_flags(key->key) & DNS_KEYFLAG_KSK) != 0);
dst_key_setbool(key->key, DST_BOOL_KSK, (ksk || csk));
dst_key_setbool(key->key, DST_BOOL_KSK, ksk || csk);
}
ret = dst_key_getbool(key->key, DST_BOOL_ZSK, &zsk);
if (ret != ISC_R_SUCCESS) {
zsk = ((dst_key_flags(key->key) & DNS_KEYFLAG_KSK) == 0);
dst_key_setbool(key->key, DST_BOOL_ZSK, (zsk || csk));
dst_key_setbool(key->key, DST_BOOL_ZSK, zsk || csk);
}
/* Get time metadata. */
@ -1772,7 +1772,7 @@ keymgr_key_rollover(dns_kasp_key_t *kaspkey, dns_dnsseckey_t *active_key,
"DNSKEY %s (%s) (policy %s) in %u "
"seconds",
keystr, keymgr_keyrole(active_key->key),
dns_kasp_getname(kasp), (prepub - now));
dns_kasp_getname(kasp), prepub - now);
}
}
if (prepub == 0 || prepub > now) {
@ -2125,7 +2125,7 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass,
{
bool found_match = false;
keymgr_key_init(dkey, kasp, now, (numkeys == 1));
keymgr_key_init(dkey, kasp, now, numkeys == 1);
for (kkey = ISC_LIST_HEAD(dns_kasp_keys(kasp)); kkey != NULL;
kkey = ISC_LIST_NEXT(kkey, link))
@ -2520,8 +2520,7 @@ rollover_status(dns_dnsseckey_t *dkey, dns_kasp_t *kasp, isc_stdtime_t now,
"scheduled on "));
retire_time = keymgr_prepublication_time(
dkey, kasp,
(retire_time - active_time),
now);
retire_time - active_time, now);
} else {
RETERR(isc_buffer_printf(
buf, " Key will retire on "));

2
lib/dns/message.c
View file

@ -68,7 +68,7 @@ hexdump(const char *msg, const char *msg2, void *base, size_t len) {
} else if (cnt % 8 == 0) {
printf(" |");
}
printf(" %02x %c", *p, (isprint(*p) ? *p : ' '));
printf(" %02x %c", *p, isprint(*p) ? *p : ' ');
p++;
cnt++;

6
lib/dns/nsec3.c
View file

@ -2178,9 +2178,9 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name,
*optout = ((nsec3.flags &
DNS_NSEC3FLAG_OPTOUT) != 0);
(*logit)(arg, ISC_LOG_DEBUG(3),
(*optout ? "NSEC3 indicates optout"
: "NSEC3 indicates secure "
"range"));
*optout ? "NSEC3 indicates optout"
: "NSEC3 indicates secure "
"range");
}
answer = ISC_R_SUCCESS;
}

7
lib/dns/qpcache.c
View file

@ -510,9 +510,10 @@ static atomic_uint_fast16_t init_count = 0;
*/
static bool
need_headerupdate(dns_slabheader_t *header, isc_stdtime_t now) {
if (DNS_SLABHEADER_GETATTR(header, (DNS_SLABHEADERATTR_NONEXISTENT |
DNS_SLABHEADERATTR_ANCIENT |
DNS_SLABHEADERATTR_ZEROTTL)) != 0)
if (DNS_SLABHEADER_GETATTR(header,
DNS_SLABHEADERATTR_NONEXISTENT |
DNS_SLABHEADERATTR_ANCIENT |
DNS_SLABHEADERATTR_ZEROTTL) != 0)
{
return false;
}

7
lib/dns/rbt-cachedb.c
View file

@ -140,9 +140,10 @@
*/
static bool
need_headerupdate(dns_slabheader_t *header, isc_stdtime_t now) {
if (DNS_SLABHEADER_GETATTR(header, (DNS_SLABHEADERATTR_NONEXISTENT |
DNS_SLABHEADERATTR_ANCIENT |
DNS_SLABHEADERATTR_ZEROTTL)) != 0)
if (DNS_SLABHEADER_GETATTR(header,
DNS_SLABHEADERATTR_NONEXISTENT |
DNS_SLABHEADERATTR_ANCIENT |
DNS_SLABHEADERATTR_ZEROTTL) != 0)
{
return false;
}

2
lib/dns/rdata.c
View file

@ -2601,7 +2601,7 @@ svcb_hashttp(isc_textregion_t *alpn) {
s = alpn->base;
}
}
if (svcb_ishttp(s, (alpn->base - s))) {
if (svcb_ishttp(s, alpn->base - s)) {
return true;
}
}

2
lib/dns/rdata/generic/opt_41.c
View file

@ -44,7 +44,7 @@ fromtext_opt(ARGS_FROMTEXT) {
static isc_result_t
totext_opt(ARGS_TOTEXT) {
isc_region_t r;
isc_region_t or ;
isc_region_t or;
uint16_t option;
uint16_t length;
char buf[sizeof("64000 64000")];

2
lib/dns/rdataset.c
View file

@ -663,7 +663,7 @@ dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
* If we accept expired RRsets keep them for no more than 120 seconds.
*/
if (acceptexpired &&
(isc_serial_le(rrsig->timeexpire, ((now + 120) & 0xffffffff)) ||
(isc_serial_le(rrsig->timeexpire, (now + 120) & 0xffffffff) ||
isc_serial_le(rrsig->timeexpire, now)))
{
ttl = 120;

11
lib/dns/rdataslab.c
View file

@ -668,7 +668,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
*/
tcurrent += (tcount * 4);
offsettable = isc_mem_cget(mctx, (ocount + oncount),
offsettable = isc_mem_cget(mctx, ocount + oncount,
sizeof(unsigned int));
#endif /* if DNS_RDATASET_FIXED */
@ -773,8 +773,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
#if DNS_RDATASET_FIXED
fillin_offsets(offsetbase, offsettable, ocount + oncount);
isc_mem_cput(mctx, offsettable, (ocount + oncount),
sizeof(unsigned int));
isc_mem_cput(mctx, offsettable, ocount + oncount, sizeof(unsigned int));
#endif /* if DNS_RDATASET_FIXED */
INSIST(tcurrent == tstart + tlength);
@ -1072,8 +1071,8 @@ void
dns_slabheader_copycase(dns_slabheader_t *dest, dns_slabheader_t *src) {
if (CASESET(src)) {
uint_least16_t attr = DNS_SLABHEADER_GETATTR(
src, (DNS_SLABHEADERATTR_CASESET |
DNS_SLABHEADERATTR_CASEFULLYLOWER));
src, DNS_SLABHEADERATTR_CASESET |
DNS_SLABHEADERATTR_CASEFULLYLOWER);
DNS_SLABHEADER_SETATTR(dest, attr);
memmove(dest->upper, src->upper, sizeof(src->upper));
}
@ -1090,7 +1089,7 @@ dns_slabheader_reset(dns_slabheader_t *h, dns_db_t *db, dns_dbnode_t *node) {
atomic_init(&h->attributes, 0);
atomic_init(&h->last_refresh_fail_ts, 0);
STATIC_ASSERT((sizeof(h->attributes) == 2),
STATIC_ASSERT(sizeof(h->attributes) == 2,
"The .attributes field of dns_slabheader_t needs to be "
"16-bit int type exactly.");
}

2
lib/dns/resolver.c
View file

@ -7717,7 +7717,7 @@ resquery_response_continue(void *arg, isc_result_t result) {
/*
* Clear cache bits.
*/
FCTX_ATTR_CLR(fctx, (FCTX_ATTR_WANTNCACHE | FCTX_ATTR_WANTCACHE));
FCTX_ATTR_CLR(fctx, FCTX_ATTR_WANTNCACHE | FCTX_ATTR_WANTCACHE);
/*
* Did we get any answers?

10
lib/dns/rrl.c
View file

@ -238,7 +238,7 @@ expand_entries(dns_rrl_t *rrl, int newsize) {
}
bsize = sizeof(dns_rrl_block_t) +
ISC_CHECKED_MUL((newsize - 1), sizeof(dns_rrl_entry_t));
ISC_CHECKED_MUL(newsize - 1, sizeof(dns_rrl_entry_t));
b = isc_mem_cget(rrl->mctx, 1, bsize);
b->size = bsize;
@ -277,7 +277,7 @@ free_old_hash(dns_rrl_t *rrl) {
isc_mem_put(rrl->mctx, old_hash,
sizeof(*old_hash) +
ISC_CHECKED_MUL((old_hash->length - 1),
ISC_CHECKED_MUL(old_hash->length - 1,
sizeof(old_hash->bins[0])));
rrl->old_hash = NULL;
}
@ -304,7 +304,7 @@ expand_rrl_hash(dns_rrl_t *rrl, isc_stdtime_t now) {
new_bins = hash_divisor(new_bins);
hsize = sizeof(dns_rrl_hash_t) +
ISC_CHECKED_MUL((new_bins - 1), sizeof(hash->bins[0]));
ISC_CHECKED_MUL(new_bins - 1, sizeof(hash->bins[0]));
hash = isc_mem_cget(rrl->mctx, 1, hsize);
hash->length = new_bins;
rrl->hash_gen ^= 1;
@ -1302,14 +1302,14 @@ dns_rrl_view_destroy(dns_view_t *view) {
h = rrl->hash;
if (h != NULL) {
isc_mem_put(rrl->mctx, h,
sizeof(*h) + ISC_CHECKED_MUL((h->length - 1),
sizeof(*h) + ISC_CHECKED_MUL(h->length - 1,
sizeof(h->bins[0])));
}
h = rrl->old_hash;
if (h != NULL) {
isc_mem_put(rrl->mctx, h,
sizeof(*h) + ISC_CHECKED_MUL((h->length - 1),
sizeof(*h) + ISC_CHECKED_MUL(h->length - 1,
sizeof(h->bins[0])));
}

22
lib/dns/stats.c
View file

@ -196,7 +196,7 @@ dns_rdatatypestats_create(isc_mem_t *mctx, dns_stats_t **statsp) {
* Create rdtype statistics for the first 255 RRtypes,
* plus one additional for other RRtypes.
*/
create_stats(mctx, dns_statstype_rdtype, (RDTYPECOUNTER_MAXTYPE + 1),
create_stats(mctx, dns_statstype_rdtype, RDTYPECOUNTER_MAXTYPE + 1,
statsp);
}
@ -204,7 +204,7 @@ void
dns_rdatasetstats_create(isc_mem_t *mctx, dns_stats_t **statsp) {
REQUIRE(statsp != NULL && *statsp == NULL);
create_stats(mctx, dns_statstype_rdataset, (RDTYPECOUNTER_MAXVAL + 1),
create_stats(mctx, dns_statstype_rdataset, RDTYPECOUNTER_MAXVAL + 1,
statsp);
}
@ -366,7 +366,7 @@ dns_dnssecsignstats_increment(dns_stats_t *stats, dns_keytag_t id, uint8_t alg,
uint32_t counter = isc_stats_get_counter(stats->counters, idx);
if (counter == kval) {
/* Match */
isc_stats_increment(stats->counters, (idx + operation));
isc_stats_increment(stats->counters, idx + operation);
return;
}
}
@ -377,23 +377,23 @@ dns_dnssecsignstats_increment(dns_stats_t *stats, dns_keytag_t id, uint8_t alg,
uint32_t counter = isc_stats_get_counter(stats->counters, idx);
if (counter == 0) {
isc_stats_set(stats->counters, kval, idx);
isc_stats_increment(stats->counters, (idx + operation));
isc_stats_increment(stats->counters, idx + operation);
return;
}
}
/* No room, grow stats storage. */
isc_stats_resize(&stats->counters,
(num_keys * dnssecsign_block_size * 2));
num_keys * dnssecsign_block_size * 2);
/* Reset counters for new key (new index, nidx). */
int nidx = num_keys * dnssecsign_block_size;
isc_stats_set(stats->counters, kval, nidx);
isc_stats_set(stats->counters, 0, (nidx + dns_dnssecsignstats_sign));
isc_stats_set(stats->counters, 0, (nidx + dns_dnssecsignstats_refresh));
isc_stats_set(stats->counters, 0, nidx + dns_dnssecsignstats_sign);
isc_stats_set(stats->counters, 0, nidx + dns_dnssecsignstats_refresh);
/* And increment the counter for the given operation. */
isc_stats_increment(stats->counters, (nidx + operation));
isc_stats_increment(stats->counters, nidx + operation);
}
void
@ -416,9 +416,9 @@ dns_dnssecsignstats_clear(dns_stats_t *stats, dns_keytag_t id, uint8_t alg) {
/* Match */
isc_stats_set(stats->counters, 0, idx);
isc_stats_set(stats->counters, 0,
(idx + dns_dnssecsignstats_sign));
idx + dns_dnssecsignstats_sign);
isc_stats_set(stats->counters, 0,
(idx + dns_dnssecsignstats_refresh));
idx + dns_dnssecsignstats_refresh);
return;
}
}
@ -545,7 +545,7 @@ dnssec_statsdump(isc_stats_t *stats, dnssecsignstats_type_t operation,
continue;
}
val = isc_stats_get_counter(stats, (idx + operation));
val = isc_stats_get_counter(stats, idx + operation);
if ((options & ISC_STATSDUMP_VERBOSE) == 0 && val == 0) {
continue;
}

10
lib/dns/ttl.c
View file

@ -89,23 +89,23 @@ dns_ttl_totext(uint32_t src, bool verbose, bool upcase, isc_buffer_t *target) {
x = 0;
if (weeks != 0) {
RETERR(ttlfmt(weeks, "week", verbose, (x > 0), target));
RETERR(ttlfmt(weeks, "week", verbose, x > 0, target));
x++;
}
if (days != 0) {
RETERR(ttlfmt(days, "day", verbose, (x > 0), target));
RETERR(ttlfmt(days, "day", verbose, x > 0, target));
x++;
}
if (hours != 0) {
RETERR(ttlfmt(hours, "hour", verbose, (x > 0), target));
RETERR(ttlfmt(hours, "hour", verbose, x > 0, target));
x++;
}
if (mins != 0) {
RETERR(ttlfmt(mins, "minute", verbose, (x > 0), target));
RETERR(ttlfmt(mins, "minute", verbose, x > 0, target));
x++;
}
if (secs != 0 || (weeks == 0 && days == 0 && hours == 0 && mins == 0)) {
RETERR(ttlfmt(secs, "second", verbose, (x > 0), target));
RETERR(ttlfmt(secs, "second", verbose, x > 0, target));
x++;
}
INSIST(x > 0);

39
lib/dns/zone.c
View file

@ -1566,7 +1566,7 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) {
REQUIRE(argv != NULL && *argv == NULL);
LOCK_ZONE(zone);
size = ISC_CHECKED_MUL((zone->db_argc + 1), sizeof(char *));
size = ISC_CHECKED_MUL(zone->db_argc + 1, sizeof(char *));
for (i = 0; i < zone->db_argc; i++) {
size += strlen(zone->db_argv[i]) + 1;
}
@ -1575,7 +1575,7 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) {
tmp = mem;
tmp2 = mem;
base = mem;
tmp2 += ISC_CHECKED_MUL((zone->db_argc + 1), sizeof(char *));
tmp2 += ISC_CHECKED_MUL(zone->db_argc + 1, sizeof(char *));
for (i = 0; i < zone->db_argc; i++) {
*tmp++ = tmp2;
strlcpy(tmp2, zone->db_argv[i], size - (tmp2 - base));
@ -4268,7 +4268,7 @@ load_secroots(dns_zone_t *zone, dns_name_t *name, dns_rdataset_t *rdataset) {
/* Add to keytables. */
trusted++;
trust_key(zone, name, &dnskey, (keydata.addhd == 0));
trust_key(zone, name, &dnskey, keydata.addhd == 0);
}
if (trusted == 0 && pending != 0) {
@ -4446,7 +4446,7 @@ add_soa(dns_zone_t *zone, dns_db_t *db) {
failure:
dns_diff_clear(&diff);
if (ver != NULL) {
dns_db_closeversion(db, &ver, (result == ISC_R_SUCCESS));
dns_db_closeversion(db, &ver, result == ISC_R_SUCCESS);
}
INSIST(ver == NULL);
@ -6183,7 +6183,7 @@ keyfromfile(dns_zone_t *zone, dst_key_t *pubkey, isc_mem_t *mctx,
result = dst_key_fromfile(
dst_key_name(pubkey), dst_key_id(pubkey),
dst_key_alg(pubkey),
(DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE),
DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE,
directory, mctx, &foundkey);
} else {
for (dns_kasp_key_t *kkey = ISC_LIST_HEAD(dns_kasp_keys(kasp));
@ -6196,8 +6196,8 @@ keyfromfile(dns_zone_t *zone, dst_key_t *pubkey, isc_mem_t *mctx,
result = dst_key_fromfile(
dst_key_name(pubkey), dst_key_id(pubkey),
dst_key_alg(pubkey),
(DST_TYPE_PUBLIC | DST_TYPE_PRIVATE |
DST_TYPE_STATE),
DST_TYPE_PUBLIC | DST_TYPE_PRIVATE |
DST_TYPE_STATE,
directory, mctx, &foundkey);
if (result == ISC_R_SUCCESS) {
break;
@ -6279,8 +6279,8 @@ findzonekeys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
result2 = dst_key_getfilename(
dst_key_name(pubkey), dst_key_id(pubkey),
dst_key_alg(pubkey),
(DST_TYPE_PUBLIC | DST_TYPE_PRIVATE |
DST_TYPE_STATE),
DST_TYPE_PUBLIC | DST_TYPE_PRIVATE |
DST_TYPE_STATE,
NULL, mctx, &buf);
if (result2 != ISC_R_SUCCESS) {
char namebuf[DNS_NAME_FORMATSIZE];
@ -6696,8 +6696,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
if (!dns_rdatatype_iskeymaterial(type)) {
bool warn = false, deleted = false;
if (delsig_ok(&rrsig, keys, nkeys, (kasp != NULL),
&warn))
if (delsig_ok(&rrsig, keys, nkeys, kasp != NULL, &warn))
{
result = update_one_rr(db, ver, zonediff->diff,
DNS_DIFFOP_DELRESIGN,
@ -15999,8 +15998,8 @@ dns_zone_logv(dns_zone_t *zone, isc_logcategory_t *category, int level,
}
isc_log_write(dns_lctx, category, DNS_LOGMODULE_ZONE, level,
"%s%s%s%s: %s", (prefix != NULL ? prefix : ""),
(prefix != NULL ? ": " : ""), zstr, zone->strnamerd,
"%s%s%s%s: %s", prefix != NULL ? prefix : "",
prefix != NULL ? ": " : "", zstr, zone->strnamerd,
message);
}
@ -16267,7 +16266,7 @@ fail:
addrbuf, isc_result_totext(result));
notify->flags |= DNS_NOTIFY_TCP;
dns_request_destroy(&notify->request);
notify_send_queue(notify, (notify->flags & DNS_NOTIFY_STARTUP));
notify_send_queue(notify, notify->flags & DNS_NOTIFY_STARTUP);
return;
} else if (result == ISC_R_TIMEDOUT) {
notify_log(notify->zone, ISC_LOG_WARNING,
@ -19929,9 +19928,9 @@ dns_zone_setdialup(dns_zone_t *zone, dns_dialuptype_t dialup) {
case dns_dialuptype_no:
break;
case dns_dialuptype_yes:
DNS_ZONE_SETFLAG(zone, (DNS_ZONEFLG_DIALNOTIFY |
DNS_ZONEFLG_DIALREFRESH |
DNS_ZONEFLG_NOREFRESH));
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_DIALNOTIFY |
DNS_ZONEFLG_DIALREFRESH |
DNS_ZONEFLG_NOREFRESH);
break;
case dns_dialuptype_notify:
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_DIALNOTIFY);
@ -22755,7 +22754,7 @@ zone_rekey(dns_zone_t *zone) {
CHECK(dns_diff_apply(&diff, db, ver));
CHECK(clean_nsec3param(zone, db, ver, &diff));
CHECK(add_signing_records(db, zone->privatetype, ver,
&diff, (newalg || fullsign)));
&diff, newalg || fullsign));
CHECK(update_soa_serial(zone, db, ver, &diff, mctx,
zone->updatemethod));
CHECK(add_chains(zone, db, ver, &diff));
@ -23704,7 +23703,7 @@ dns_zone_keydone(dns_zone_t *zone, const char *keystr) {
isc_buffer_init(&b, kd->data, sizeof(kd->data));
isc_buffer_putuint8(&b, alg);
isc_buffer_putuint8(&b, (keyid & 0xff00) >> 8);
isc_buffer_putuint8(&b, (keyid & 0xff));
isc_buffer_putuint8(&b, keyid & 0xff);
isc_buffer_putuint8(&b, 0);
isc_buffer_putuint8(&b, 1);
}
@ -24472,7 +24471,7 @@ setserial(void *arg) {
"setserial: desired serial (%u) "
"out of range (%u-%u)",
desired, oldserial + 1,
(oldserial + 0x7fffffff));
oldserial + 0x7fffffff);
}
goto failure;
}

2
lib/isc/netmgr/proxyudp.c
View file

@ -869,7 +869,7 @@ isc__nm_proxyudp_send(isc_nmhandle_t *handle, isc_region_t *region,
}
send_req = proxyudp_get_send_req(sock->worker->mctx, sock, handle,
(sock->client ? region : NULL), cb,
sock->client ? region : NULL, cb,
cbarg);
if (sock->client) {
isc_region_t send_data = { 0 };

4
lib/isc/proxy2.c
View file

@ -1336,7 +1336,7 @@ isc_proxy2_header_append_tlv(isc_buffer_t *restrict outbuf,
}
append_type_and_length(outbuf, (uint8_t)tlv_type,
((uint16_t)tlv_data->length), true);
(uint16_t)tlv_data->length, true);
if (tlv_data->length > 0) {
isc_result_t result = isc_proxy2_header_append(outbuf,
@ -1413,7 +1413,7 @@ isc_proxy2_append_tlv(isc_buffer_t *restrict outbuf, const uint8_t type,
return ISC_R_RANGE;
}
append_type_and_length(outbuf, (uint8_t)type, ((uint16_t)data->length),
append_type_and_length(outbuf, (uint8_t)type, (uint16_t)data->length,
false);
if (data->length > 0) {

2
lib/isc/radix.c
View file

@ -392,7 +392,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target,
}
/* I know the better way, but for now. */
for (j = 0; j < 8; j++) {
if (BIT_TEST(r, (0x80 >> j))) {
if (BIT_TEST(r, 0x80 >> j)) {
break;
}
}

6
lib/isc/result.c
View file

@ -529,13 +529,13 @@ static const char *identifier[ISC_R_NRESULTS] = {
[ISCCC_R_MAXDEPTH] = "ISCCC_R_MAXDEPTH",
};
STATIC_ASSERT((DNS_R_SERVFAIL - DNS_R_NOERROR == 2),
STATIC_ASSERT(DNS_R_SERVFAIL - DNS_R_NOERROR == 2,
"DNS_R_NOERROR has wrong value");
STATIC_ASSERT((DNS_R_BADVERS - DNS_R_NOERROR == 16),
STATIC_ASSERT(DNS_R_BADVERS - DNS_R_NOERROR == 16,
"DNS_R_BADVERS has wrong value");
STATIC_ASSERT((ISC_R_NRESULTS < INT32_MAX), "result.h enum too big");
STATIC_ASSERT(ISC_R_NRESULTS < INT32_MAX, "result.h enum too big");
const char *
isc_result_totext(isc_result_t result) {

2
lib/isccfg/kaspconf.c
View file

@ -766,7 +766,7 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, dns_kasp_t *default_kasp,
if (default_kasp != NULL && dns_kasp_nsec3(default_kasp)) {
dns_kasp_setnsec3param(
kasp, dns_kasp_nsec3iter(default_kasp),
(dns_kasp_nsec3flags(default_kasp) == 0x01),
dns_kasp_nsec3flags(default_kasp) == 0x01,
dns_kasp_nsec3saltlen(default_kasp));
} else {
dns_kasp_setnsec3(kasp, false);

6
lib/isccfg/parser.c
View file

@ -539,9 +539,9 @@ cfg_parser_create(isc_mem_t *mctx, isc_log_t *lctx, cfg_parser_t **ret) {
isc_lex_create(pctx->mctx, 1024, &pctx->lexer);
isc_lex_setspecials(pctx->lexer, specials);
isc_lex_setcomments(pctx->lexer,
(ISC_LEXCOMMENT_C | ISC_LEXCOMMENT_CPLUSPLUS |
ISC_LEXCOMMENT_SHELL));
isc_lex_setcomments(pctx->lexer, ISC_LEXCOMMENT_C |
ISC_LEXCOMMENT_CPLUSPLUS |
ISC_LEXCOMMENT_SHELL);
CHECK(cfg_create_list(pctx, &cfg_type_filelist, &pctx->open_files));
CHECK(cfg_create_list(pctx, &cfg_type_filelist, &pctx->closed_files));

4
lib/ns/client.c
View file

@ -1340,8 +1340,8 @@ process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) {
if (alwaysvalid) {
now = when;
}
if (isc_serial_gt(when, (now + 300)) /* In the future. */ ||
isc_serial_lt(when, (now - 3600)) /* In the past. */)
if (isc_serial_gt(when, now + 300) /* In the future. */ ||
isc_serial_lt(when, now - 3600) /* In the past. */)
{
client->attributes |= NS_CLIENTATTR_BADCOOKIE;
ns_stats_increment(client->manager->sctx->nsstats,

2
lib/ns/query.c
View file

@ -4653,7 +4653,7 @@ cleanup:
#ifdef USE_DNSRPS
if (st->popt.dnsrps_enabled && st->m.policy != DNS_RPZ_POLICY_ERROR &&
!dnsrps_set_p(&emsg, client, st, qtype, &rdataset,
(qresult_type != qresult_type_recurse)))
qresult_type != qresult_type_recurse))
{
rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, NULL,
DNS_RPZ_TYPE_BAD, emsg.c, DNS_R_SERVFAIL);

2
tests/bench/qpmulti.c
View file

@ -762,7 +762,7 @@ collect(void *varg) {
nloops = zipf ? bctx->nloops : bctx->readers + bctx->mutate;
for (uint32_t t = 0; t < nloops; t++) {
struct thread_args *tp = &thread[t];
elapsed = ISC_MAX(elapsed, (tp->stop - tp->start));
elapsed = ISC_MAX(elapsed, tp->stop - tp->start);
bool mut = t < bctx->mutate;
stats[mut].worked += tp->worked;

4
tests/dns/dst_test.c
View file

@ -77,7 +77,7 @@ sig_fromfile(const char *path, isc_buffer_t *buf) {
result = isc_file_getsizefd(fileno(fp), &size);
assert_int_equal(result, ISC_R_SUCCESS);
data = isc_mem_get(mctx, (size + 1));
data = isc_mem_get(mctx, size + 1);
assert_non_null(data);
len = (size_t)size;
@ -158,7 +158,7 @@ check_sig(const char *datapath, const char *sigpath, const char *keyname,
result = isc_file_getsizefd(fileno(fp), &size);
assert_int_equal(result, ISC_R_SUCCESS);
data = isc_mem_get(mctx, (size + 1));
data = isc_mem_get(mctx, size + 1);
assert_non_null(data);
p = data;

4
tests/dns/name_test.c
View file

@ -702,7 +702,7 @@ ISC_RUN_TEST_IMPL(hash) {
testcases[i].name2, h2);
}
assert_int_equal((h1 == h2), testcases[i].expect);
assert_int_equal(h1 == h2, testcases[i].expect);
/* Now case-sensitive */
h1 = dns_name_hash(n1);
@ -715,7 +715,7 @@ ISC_RUN_TEST_IMPL(hash) {
testcases[i].name2, h2);
}
assert_int_equal((h1 == h2), testcases[i].expect);
assert_int_equal(h1 == h2, testcases[i].expect);
}
}

2
tests/dns/private_test.c
View file

@ -190,8 +190,10 @@ ISC_RUN_TEST_IMPL(private_nsec3_totext) {
const char *results[] = { "Creating NSEC3 chain 1 0 1 BEEF",
"Creating NSEC3 chain 1 1 10 DADD",
"Pending NSEC3 chain 1 0 20 BEAD",
/* clang-format off */
("Removing NSEC3 chain 1 0 30 DEAF / "
"creating NSEC chain"),
/* clang-format on */
"Removing NSEC3 chain 1 0 100 FEEDABEE" };
int ncases = 5;

6
tests/dns/skr_test.c
View file

@ -236,7 +236,7 @@ create_bundle(FILE *fp, isc_stdtime_t btime, int bnum) {
ISC_LIST_APPEND(dnskeylist->rdata, &test_bundles[bnum].ksk, link);
dns_rdatalist_tordataset(dnskeylist, dnskeyset);
dns_rdata_init(&test_bundles[bnum].dnskey_rrsig);
sign_rrset(fp, btime, (btime + LIFETIME), dnskeyset,
sign_rrset(fp, btime, btime + LIFETIME, dnskeyset,
test_bundles[bnum].rrsig1buf,
&test_bundles[bnum].dnskey_rrsig);
for (dns_rdata_t *rd = ISC_LIST_HEAD(dnskeylist->rdata); rd != NULL;
@ -263,7 +263,7 @@ create_bundle(FILE *fp, isc_stdtime_t btime, int bnum) {
ISC_LIST_APPEND(cdnskeylist->rdata, &test_bundles[bnum].cdnskey, link);
dns_rdatalist_tordataset(cdnskeylist, cdnskeyset);
dns_rdata_init(&test_bundles[bnum].cdnskey_rrsig);
sign_rrset(fp, btime, (btime + LIFETIME), cdnskeyset,
sign_rrset(fp, btime, btime + LIFETIME, cdnskeyset,
test_bundles[bnum].rrsig2buf,
&test_bundles[bnum].cdnskey_rrsig);
for (dns_rdata_t *rd = ISC_LIST_HEAD(cdnskeylist->rdata); rd != NULL;
@ -289,7 +289,7 @@ create_bundle(FILE *fp, isc_stdtime_t btime, int bnum) {
ISC_LIST_APPEND(cdslist->rdata, &test_bundles[bnum].cds, link);
dns_rdatalist_tordataset(cdslist, cdsset);
dns_rdata_init(&test_bundles[bnum].cds_rrsig);
sign_rrset(fp, btime, (btime + LIFETIME), cdsset,
sign_rrset(fp, btime, btime + LIFETIME, cdsset,
test_bundles[bnum].rrsig3buf, &test_bundles[bnum].cds_rrsig);
for (dns_rdata_t *rd = ISC_LIST_HEAD(cdslist->rdata); rd != NULL;
rd = ISC_LIST_HEAD(cdslist->rdata))

2
tests/isc/crc64_test.c
View file

@ -55,7 +55,7 @@ _crc64(const char *buf, size_t buflen, const char *result, const int repeats) {
char hex[16 + 1];
snprintf(hex, sizeof(hex), "%016" PRIX64, crc);
assert_memory_equal(hex, result, (result ? strlen(result) : 0));
assert_memory_equal(hex, result, result ? strlen(result) : 0);
}
/* 64-bit cyclic redundancy check */

2
tests/isc/hmac_test.c
View file

@ -122,7 +122,7 @@ isc_hmac_test(isc_hmac_t *hmac_st, const void *key, size_t keylen,
assert_return_code(res, ISC_R_SUCCESS);
assert_memory_equal(hexdigest, result, (result ? strlen(result) : 0));
assert_memory_equal(hexdigest, result, result ? strlen(result) : 0);
assert_int_equal(isc_hmac_reset(hmac_st), ISC_R_SUCCESS);
}

2
tests/isc/md_test.c
View file

@ -107,7 +107,7 @@ isc_md_test(isc_md_t *md, const isc_md_type_t *type, const char *buf,
assert_return_code(res, ISC_R_SUCCESS);
assert_memory_equal(hexdigest, result, (result ? strlen(result) : 0));
assert_memory_equal(hexdigest, result, result ? strlen(result) : 0);
assert_int_equal(isc_md_reset(md), ISC_R_SUCCESS);
}

6
tests/isc/netmgr_common.c
View file

@ -389,9 +389,9 @@ connect_connect_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
do_cconnects_shutdown(loopmgr);
} else if (do_send) {
isc_async_current(stream_recv_send_connect,
(cbarg == NULL
? get_stream_connect_function()
: (stream_connect_function)cbarg));
cbarg == NULL
? get_stream_connect_function()
: (stream_connect_function)cbarg);
}
isc_refcount_increment0(&active_creads);