From: Michal Nowak Date: Wed, 2 Nov 2022 18:33:14 +0000 (+0100) Subject: Update sources to Clang 15 formatting X-Git-Tag: v9.19.8~38^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afdb41a5aa02db29340570b3c419597af2426a6f;p=thirdparty%2Fbind9.git Update sources to Clang 15 formatting --- diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index 20e901c5d29..ce36194d7ae 100644 --- a/bin/check/check-tool.c +++ b/bin/check/check-tool.c @@ -205,7 +205,8 @@ checkns(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner, */ cur = ai; while (cur != NULL && cur->ai_canonname == NULL && - cur->ai_next != NULL) { + cur->ai_next != NULL) + { cur = cur->ai_next; } if (cur != NULL && cur->ai_canonname != NULL && @@ -407,7 +408,8 @@ checkmx(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { */ cur = ai; while (cur != NULL && cur->ai_canonname == NULL && - cur->ai_next != NULL) { + cur->ai_next != NULL) + { cur = cur->ai_next; } if (cur != NULL && cur->ai_canonname != NULL && @@ -493,7 +495,8 @@ checksrv(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { */ cur = ai; while (cur != NULL && cur->ai_canonname == NULL && - cur->ai_next != NULL) { + cur->ai_next != NULL) + { cur = cur->ai_next; } if (cur != NULL && cur->ai_canonname != NULL && diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c index 1e874f32d93..39d009fb501 100644 --- a/bin/check/named-checkzone.c +++ b/bin/check/named-checkzone.c @@ -483,7 +483,8 @@ main(int argc, char **argv) { outputformat = dns_masterformat_raw; rawversion = strtol(outputformatstr + 4, &end, 10); if (end == outputformatstr + 4 || *end != '\0' || - rawversion > 1U) { + rawversion > 1U) + { fprintf(stderr, "unknown raw format version\n"); exit(1); } @@ -522,7 +523,8 @@ main(int argc, char **argv) { } if (argc - isc_commandline_index < 1 || - argc - isc_commandline_index > 2) { + argc - isc_commandline_index > 2) + { usage(); } diff --git a/bin/confgen/tsig-keygen.c b/bin/confgen/tsig-keygen.c index f6c5b2e2722..b44f1a91585 100644 --- a/bin/confgen/tsig-keygen.c +++ b/bin/confgen/tsig-keygen.c @@ -127,7 +127,8 @@ main(int argc, char **argv) { isc_commandline_errprint = false; while ((ch = isc_commandline_parse(argc, argv, "a:hk:Mmr:qs:y:z:")) != - -1) { + -1) + { switch (ch) { case 'a': algname = isc_commandline_argument; diff --git a/bin/delv/delv.c b/bin/delv/delv.c index 8554f753461..84e808894a8 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -464,7 +464,8 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner) { result = dns_rdataset_next(rdataset)) { if ((rdataset->attributes & - DNS_RDATASETATTR_NEGATIVE) != 0) { + DNS_RDATASETATTR_NEGATIVE) != 0) + { continue; } @@ -488,7 +489,8 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner) { } else { dns_indent_t indent = { " ", 2 }; if (!yaml && (rdataset->attributes & - DNS_RDATASETATTR_NEGATIVE) != 0) { + DNS_RDATASETATTR_NEGATIVE) != 0) + { isc_buffer_putstr(&target, "; "); } result = dns_master_rdatasettotext( @@ -784,7 +786,8 @@ load_keys(const cfg_obj_t *keys, dns_client_t *client) { keylist = cfg_listelt_value(elt); for (elt2 = cfg_list_first(keylist); elt2 != NULL; - elt2 = cfg_list_next(elt2)) { + elt2 = cfg_list_next(elt2)) + { key = cfg_listelt_value(elt2); CHECK(key_fromconfig(key, client)); } @@ -943,7 +946,8 @@ addserver(dns_client_t *client) { result = ISC_R_SUCCESS; for (cur = res; cur != NULL; cur = cur->ai_next) { if (cur->ai_family != AF_INET && - cur->ai_family != AF_INET6) { + cur->ai_family != AF_INET6) + { continue; } sa = isc_mem_get(mctx, sizeof(*sa)); @@ -1444,7 +1448,8 @@ dash_option(char *option, char *next, bool *open_type_class) { warn("extra query type"); } if (rdtype == dns_rdatatype_ixfr || - rdtype == dns_rdatatype_axfr) { + rdtype == dns_rdatatype_axfr) + { fatal("Transfer not supported"); } qtype = rdtype; @@ -1523,7 +1528,8 @@ preparse_args(int argc, char **argv) { /* Look for dash value option. */ if (strpbrk(option, dash_opts) != &option[0] || - strlen(option) > 1U) { + strlen(option) > 1U) + { /* Error or value in option. */ continue; } @@ -1561,13 +1567,15 @@ parse_args(int argc, char **argv) { } else if (argv[0][0] == '-') { if (argc <= 1) { if (dash_option(&argv[0][1], NULL, - &open_type_class)) { + &open_type_class)) + { argc--; argv++; } } else { if (dash_option(&argv[0][1], argv[1], - &open_type_class)) { + &open_type_class)) + { argc--; argv++; } @@ -1586,7 +1594,8 @@ parse_args(int argc, char **argv) { warn("extra query type"); } if (rdtype == dns_rdatatype_ixfr || - rdtype == dns_rdatatype_axfr) { + rdtype == dns_rdatatype_axfr) + { fatal("Transfer not supported"); } qtype = rdtype; diff --git a/bin/dig/dig.c b/bin/dig/dig.c index fb77aaa6c96..92ebd06a0bf 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -693,7 +693,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, flags |= DNS_MESSAGETEXTFLAG_NOCOMMENTS; } if (query->lookup->onesoa && - query->lookup->rdtype == dns_rdatatype_axfr) { + query->lookup->rdtype == dns_rdatatype_axfr) + { flags |= (query->msg_count == 0) ? DNS_MESSAGETEXTFLAG_ONESOA : DNS_MESSAGETEXTFLAG_OMITSOA; } @@ -1794,7 +1795,8 @@ plus_option(char *option, bool is_batchfile, bool *need_clone, } for (num = 0; num < sizeof(opcodetext) / sizeof(opcodetext[0]); - num++) { + num++) + { if (strcasecmp(opcodetext[num], value) == 0) { break; } @@ -2072,7 +2074,8 @@ plus_option(char *option, bool is_batchfile, bool *need_clone, switch (cmd[2]) { case 's': if (!plus_tls_options(cmd, value, state, - lookup)) { + lookup)) + { goto invalid_option; } break; @@ -2413,7 +2416,8 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, result = dns_rdatatype_fromtext( &rdtype, (isc_textregion_t *)&tr); if (result == ISC_R_SUCCESS && - rdtype == dns_rdatatype_ixfr) { + rdtype == dns_rdatatype_ixfr) + { result = DNS_R_UNKNOWN; } } @@ -2486,7 +2490,8 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, } *need_clone = true; if (get_reverse(textname, sizeof(textname), value, false) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { strlcpy((*lookup)->textname, textname, sizeof((*lookup)->textname)); debug("looking up %s", (*lookup)->textname); @@ -2668,7 +2673,8 @@ parse_args(bool is_batchfile, bool config_only, int argc, char **argv) { } if (batchfp != NULL) { while (fgets(batchline, sizeof(batchline), batchfp) != - 0) { + 0) + { debug("config line %s", batchline); bargc = split_batchline(batchline, bargv, 62, ".digrc argv"); @@ -2760,7 +2766,8 @@ parse_args(bool is_batchfile, bool config_only, int argc, char **argv) { &rdtype, (isc_textregion_t *)&tr); if (result == ISC_R_SUCCESS && - rdtype == dns_rdatatype_ixfr) { + rdtype == dns_rdatatype_ixfr) + { fprintf(stderr, ";; Warning, " "ixfr requires " "a " @@ -2800,7 +2807,8 @@ parse_args(bool is_batchfile, bool config_only, int argc, char **argv) { lookup->rdtype = rdtype; lookup->rdtypeset = true; if (rdtype == - dns_rdatatype_axfr) { + dns_rdatatype_axfr) + { lookup->section_question = plusquest; lookup->comments = @@ -2808,7 +2816,8 @@ parse_args(bool is_batchfile, bool config_only, int argc, char **argv) { } if (rdtype == dns_rdatatype_any && - !lookup->tcp_mode_set) { + !lookup->tcp_mode_set) + { lookup->tcp_mode = true; } lookup->ixfr_serial = false; diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index e4900dac356..b85142e6b4c 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -478,7 +478,8 @@ get_server_list(irs_resconf_t *resconf) { debug("get_server_list()"); servers = irs_resconf_getnameservers(resconf); for (sa = ISC_LIST_HEAD(*servers); sa != NULL; - sa = ISC_LIST_NEXT(sa, link)) { + sa = ISC_LIST_NEXT(sa, link)) + { int pf = isc_sockaddr_pf(sa); isc_netaddr_t na; isc_result_t result; @@ -1919,7 +1920,8 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) { dns_rdata_ns_t ns; if (query->lookup->trace_root && - query->lookup->nsfound >= MXSERV) { + query->lookup->nsfound >= MXSERV) + { break; } @@ -1940,7 +1942,8 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) { cancel_lookup(query->lookup); lookup->doing_xfr = false; if (!lookup->trace_root && - section == DNS_SECTION_ANSWER) { + section == DNS_SECTION_ANSWER) + { lookup->trace = false; } else { lookup->trace = query->lookup->trace; @@ -2780,7 +2783,8 @@ _cancel_lookup(dig_lookup_t *lookup, const char *file, unsigned int line) { query->lookup); query->canceled = true; if (query->readhandle != NULL && - !isc_nm_is_http_handle(query->readhandle)) { + !isc_nm_is_http_handle(query->readhandle)) + { isc_nm_cancelread(query->readhandle); } query_detach(&query); @@ -2856,7 +2860,8 @@ get_create_tls_context(dig_query_t *query, const bool is_https, } if (query->lookup->tls_key_file_set && - query->lookup->tls_cert_file_set) { + query->lookup->tls_cert_file_set) + { result = isc_tlsctx_load_certificate( ctx, query->lookup->tls_key_file, query->lookup->tls_cert_file); @@ -2948,7 +2953,8 @@ start_tcp(dig_query_t *query) { if (tls_mode) { port = 853; } else if (query->lookup->https_mode && - !query->lookup->http_plain) { + !query->lookup->http_plain) + { port = 443; } else if (query->lookup->https_mode) { port = 80; @@ -3693,13 +3699,15 @@ check_for_more_data(dig_lookup_t *lookup, dig_query_t *query, * it's an SOA */ if ((!query->first_soa_rcvd) && - (rdata.type != dns_rdatatype_soa)) { + (rdata.type != dns_rdatatype_soa)) + { puts("; Transfer failed. " "Didn't start with SOA answer."); return (true); } if ((!query->second_rr_rcvd) && - (rdata.type != dns_rdatatype_soa)) { + (rdata.type != dns_rdatatype_soa)) + { query->second_rr_rcvd = true; query->second_rr_serial = 0; debug("got the second rr as nonsoa"); @@ -4265,7 +4273,8 @@ recv_done(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region, } if ((msg->flags & DNS_MESSAGEFLAG_TC) != 0 && !l->ignore && - !l->tcp_mode) { + !l->tcp_mode) + { if (l->cookie == NULL && l->sendcookie && msg->opt != NULL) { process_opt(l, msg); } @@ -4397,7 +4406,8 @@ recv_done(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region, if (!l->doing_xfr || l->xfr_q == query) { if (msg->rcode == dns_rcode_nxdomain && - (l->origin != NULL || l->need_search)) { + (l->origin != NULL || l->need_search)) + { if (!next_origin(l) || showsearch) { dighost_printmessage(query, &b, msg, true); dighost_received(isc_buffer_usedlength(&b), @@ -4631,7 +4641,8 @@ cancel_all(void) { current_lookup); q->canceled = true; if (q->readhandle != NULL && - !isc_nm_is_http_handle(q->readhandle)) { + !isc_nm_is_http_handle(q->readhandle)) + { isc_nm_cancelread(q->readhandle); } query_detach(&q); diff --git a/bin/dig/host.c b/bin/dig/host.c index abc2e7bc0f4..78144f54d55 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -533,7 +533,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, } if (!ISC_LIST_EMPTY(msg->sections[DNS_SECTION_AUTHORITY]) && - !short_form) { + !short_form) + { printf("\n"); result = printsection(msg, DNS_SECTION_AUTHORITY, "AUTHORITY", true, query); @@ -542,7 +543,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, } } if (!ISC_LIST_EMPTY(msg->sections[DNS_SECTION_ADDITIONAL]) && - !short_form) { + !short_form) + { printf("\n"); result = printsection(msg, DNS_SECTION_ADDITIONAL, "ADDITIONAL", true, query); @@ -590,10 +592,12 @@ pre_parse_args(int argc, char **argv) { { isc_mem_debugging |= ISC_MEM_DEBUGTRACE; } else if (strcasecmp("record", - isc_commandline_argument) == 0) { + isc_commandline_argument) == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGRECORD; } else if (strcasecmp("usage", - isc_commandline_argument) == 0) { + isc_commandline_argument) == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGUSAGE; } break; @@ -704,7 +708,8 @@ parse_args(bool is_batchfile, int argc, char **argv) { break; case 't': if (strncasecmp(isc_commandline_argument, "ixfr=", 5) == - 0) { + 0) + { rdtype = dns_rdatatype_ixfr; /* XXXMPA add error checking */ serial = strtoul(isc_commandline_argument + 5, @@ -723,7 +728,8 @@ parse_args(bool is_batchfile, int argc, char **argv) { isc_commandline_argument); } if (!lookup->rdtypeset || - lookup->rdtype != dns_rdatatype_axfr) { + lookup->rdtype != dns_rdatatype_axfr) + { lookup->rdtype = rdtype; } lookup->rdtypeset = true; @@ -767,7 +773,8 @@ parse_args(bool is_batchfile, int argc, char **argv) { FALLTHROUGH; case 'a': if (!lookup->rdtypeset || - lookup->rdtype != dns_rdatatype_axfr) { + lookup->rdtype != dns_rdatatype_axfr) + { lookup->rdtype = dns_rdatatype_any; } list_type = dns_rdatatype_any; diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c index 77a567944d4..86271fcbc02 100644 --- a/bin/dnssec/dnssec-cds.c +++ b/bin/dnssec/dnssec-cds.c @@ -635,7 +635,8 @@ matching_sigs(keyinfo_t *keytbl, dns_rdataset_t *rdataset, NULL); if (result != ISC_R_SUCCESS && - result != DNS_R_FROMWILDCARD) { + result != DNS_R_FROMWILDCARD) + { vbprintf(1, "skip RRSIG by key %d:" " verification failed: %s\n", @@ -1084,7 +1085,8 @@ main(int argc, char *argv[]) { * optional, so that it works just like sed(1). */ if (isc_commandline_argument == - argv[isc_commandline_index - 1]) { + argv[isc_commandline_index - 1]) + { isc_commandline_index--; inplace = ""; } else { @@ -1176,7 +1178,8 @@ main(int argc, char *argv[]) { fatal("missing RRSIG CDNSKEY records for %s", namestr); } if (dns_rdataset_isassociated(&cds_set) && - !dns_rdataset_isassociated(&cds_sig)) { + !dns_rdataset_isassociated(&cds_sig)) + { fatal("missing RRSIG CDS records for %s", namestr); } @@ -1199,7 +1202,8 @@ main(int argc, char *argv[]) { if (dns_rdataset_isassociated(&cdnskey_set)) { vbprintf(1, "verify CDNSKEY signature(s)\n"); if (!signed_loose(matching_sigs(old_key_tbl, &cdnskey_set, - &cdnskey_sig))) { + &cdnskey_sig))) + { fatal("could not validate child CDNSKEY RRset for %s", namestr); } @@ -1207,7 +1211,8 @@ main(int argc, char *argv[]) { if (dns_rdataset_isassociated(&cds_set)) { vbprintf(1, "verify CDS signature(s)\n"); if (!signed_loose( - matching_sigs(old_key_tbl, &cds_set, &cds_sig))) { + matching_sigs(old_key_tbl, &cds_set, &cds_sig))) + { fatal("could not validate child CDS RRset for %s", namestr); } diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c index 4d66f8f22b5..53ca7187848 100644 --- a/bin/dnssec/dnssec-keyfromlabel.c +++ b/bin/dnssec/dnssec-keyfromlabel.c @@ -559,7 +559,8 @@ main(int argc, char **argv) { flags |= DNS_KEYOWNER_ZONE; } else if ((options & DST_TYPE_KEY) != 0) { /* KEY */ if (strcasecmp(nametype, "host") == 0 || - strcasecmp(nametype, "entity") == 0) { + strcasecmp(nametype, "entity") == 0) + { flags |= DNS_KEYOWNER_ENTITY; } else if (strcasecmp(nametype, "user") == 0) { flags |= DNS_KEYOWNER_USER; @@ -586,7 +587,8 @@ main(int argc, char **argv) { if (protocol == -1) { protocol = DNS_KEYPROTO_DNSSEC; } else if ((options & DST_TYPE_KEY) == 0 && - protocol != DNS_KEYPROTO_DNSSEC) { + protocol != DNS_KEYPROTO_DNSSEC) + { fatal("invalid DNSKEY protocol: %d", protocol); } diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index 890b4225ec6..3d77976faba 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -254,7 +254,8 @@ kasp_from_conf(cfg_obj_t *config, isc_mem_t *mctx, const char *name, cfg_obj_t *kconfig = cfg_listelt_value(element); kasp = NULL; if (strcmp(cfg_obj_asstring(cfg_tuple_get(kconfig, "name")), - name) != 0) { + name) != 0) + { continue; } @@ -391,7 +392,8 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) { if (!ctx->oldstyle && ctx->prepub > 0) { if (ctx->setpub && ctx->setact && - (ctx->activate - ctx->prepub) < ctx->publish) { + (ctx->activate - ctx->prepub) < ctx->publish) + { fatal("Activation and publication dates " "are closer together than the\n\t" "prepublication interval."); @@ -727,7 +729,8 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) { if (ctx->setdel) { if (ctx->setinact && - ctx->deltime < ctx->inactive) { + ctx->deltime < ctx->inactive) + { fprintf(stderr, "%s: warning: Key is " "scheduled to be deleted " @@ -981,7 +984,8 @@ main(int argc, char **argv) { ctx.protocol = strtol(isc_commandline_argument, &endp, 10); if (*endp != '\0' || ctx.protocol < 0 || - ctx.protocol > 255) { + ctx.protocol > 255) + { fatal("-p must be followed by a number " "[0..255]"); } @@ -997,7 +1001,8 @@ main(int argc, char **argv) { ctx.signatory = strtol(isc_commandline_argument, &endp, 10); if (*endp != '\0' || ctx.signatory < 0 || - ctx.signatory > 15) { + ctx.signatory > 15) + { fatal("-s must be followed by a number " "[0..15]"); } diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c index adf3de6fff4..93ee20cca20 100644 --- a/bin/dnssec/dnssec-revoke.c +++ b/bin/dnssec/dnssec-revoke.c @@ -136,7 +136,8 @@ main(int argc, char **argv) { } if (argc < isc_commandline_index + 1 || - argv[isc_commandline_index] == NULL) { + argv[isc_commandline_index] == NULL) + { fatal("The key file name was not specified"); } if (argc > isc_commandline_index + 1) { diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c index 1a4f20218ff..100ff88fad6 100644 --- a/bin/dnssec/dnssec-settime.c +++ b/bin/dnssec/dnssec-settime.c @@ -544,7 +544,8 @@ main(int argc, char **argv) { } if (argc < isc_commandline_index + 1 || - argv[isc_commandline_index] == NULL) { + argv[isc_commandline_index] == NULL) + { fatal("The key file name was not specified"); } if (argc > isc_commandline_index + 1) { @@ -552,7 +553,8 @@ main(int argc, char **argv) { } if ((setgoal || setds || setdnskey || setkrrsig || setzrrsig) && - !write_state) { + !write_state) + { fatal("Options -g, -d, -k, -r and -z require -s to be set"); } diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 774376000ed..64779725c65 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -365,7 +365,8 @@ keythatsigned_unlocked(dns_rdata_rrsig_t *rrsig) { dns_dnsseckey_t *key; for (key = ISC_LIST_HEAD(keylist); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { if (rrsig->keyid == dst_key_id(key->key) && rrsig->algorithm == dst_key_alg(key->key) && dns_name_equal(&rrsig->signer, dst_key_name(key->key))) @@ -565,7 +566,8 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, "invalid validity period\n", sigstr); } else if (key == NULL && !future && - expecttofindkey(&rrsig.signer)) { + expecttofindkey(&rrsig.signer)) + { /* rrsig is dropped and not replaced */ vbprintf(2, "\trrsig by %s dropped - " @@ -576,7 +578,8 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, vbprintf(2, "\trrsig by %s %s - dnskey not found\n", keep ? "retained" : "dropped", sigstr); } else if (!dns_dnssec_keyactive(key->key, now) && - remove_inactkeysigs) { + remove_inactkeysigs) + { keep = false; vbprintf(2, "\trrsig by %s dropped - key inactive\n", sigstr); @@ -677,7 +680,8 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, } for (key = ISC_LIST_HEAD(keylist); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { if (nowsignedby[key->index]) { continue; } @@ -699,7 +703,8 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, curr = ISC_LIST_NEXT(curr, link)) { if (dst_key_alg(key->key) != - dst_key_alg(curr->key)) { + dst_key_alg(curr->key)) + { continue; } if (REVOKE(curr->key)) { @@ -710,7 +715,8 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, } } if (isksk(key) || !have_ksk || - (iszsk(key) && !keyset_kskonly)) { + (iszsk(key) && !keyset_kskonly)) + { signwithkey(name, set, key->key, ttl, add, "signing with dnskey"); } @@ -751,7 +757,8 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, DST_NUM_SUCCESSOR, &suc); if (ret != ISC_R_SUCCESS || - dst_key_id(key->key) != suc) { + dst_key_id(key->key) != suc) + { continue; } @@ -1204,7 +1211,8 @@ signname(dns_dbnode_t *node, dns_name_t *name) { */ if (isdelegation) { if (rdataset.type != nsec_datatype && - rdataset.type != dns_rdatatype_ds) { + rdataset.type != dns_rdatatype_ds) + { goto skip; } } else if (rdataset.type == dns_rdatatype_ds) { @@ -1353,7 +1361,8 @@ active_node(dns_dbnode_t *node) { check_result(result, "dns_db_deleterdataset(" "rrsig)"); } else if (result != ISC_R_NOMORE && - result != ISC_R_SUCCESS) { + result != ISC_R_SUCCESS) + { fatal("rdataset iteration failed: %s", isc_result_totext(result)); } @@ -1434,7 +1443,8 @@ setsoaserial(uint32_t serial, dns_updatemethod_t method) { old_serial = dns_soa_getserial(&rdata); if (method == dns_updatemethod_date || - method == dns_updatemethod_unixtime) { + method == dns_updatemethod_unixtime) + { new_serial = dns_update_soaserial(old_serial, method, &used); } else if (serial != 0 || method == dns_updatemethod_none) { /* Set SOA serial to the value provided. */ @@ -1651,10 +1661,12 @@ assignwork(isc_task_t *task) { !dns_name_issubdomain(name, zonecut))) { if (is_delegation(gdb, gversion, gorigin, name, - node, NULL)) { + node, NULL)) + { zonecut = savezonecut(&fzonecut, name); if (!OPTOUT(nsec3flags) || - secure(name, node)) { + secure(name, node)) + { found = true; } } else if (has_dname(gdb, gversion, node)) { @@ -1836,12 +1848,14 @@ remove_records(dns_dbnode_t *node, dns_rdatatype_t which, bool checknsec) { dns_rdataset_disassociate(&rdataset); if (type == which || covers == which) { if (which == dns_rdatatype_nsec && checknsec && - !update_chain) { + !update_chain) + { fatal("Zone contains NSEC records. Use -u " "to update to NSEC3."); } if (which == dns_rdatatype_nsec3param && checknsec && - !update_chain) { + !update_chain) + { fatal("Zone contains NSEC3 chains. Use -u " "to update to NSEC."); } @@ -2285,7 +2299,8 @@ rrset_cleanup(dns_name_t *name, dns_rdataset_t *rdataset, dns_diff_t *add, count2++; dns_rdataset_current(&tmprdataset, &rdata2); if (count1 < count2 && - dns_rdata_casecompare(&rdata1, &rdata2) == 0) { + dns_rdata_casecompare(&rdata1, &rdata2) == 0) + { vbprintf(2, "removing duplicate at %s/%s\n", namestr, typestr); result = dns_difftuple_create( @@ -2452,14 +2467,16 @@ nsec3ify(unsigned int hashalg, dns_iterations_t iterations, continue; } if (is_delegation(gdb, gversion, gorigin, nextname, - nextnode, &nsttl)) { + nextnode, &nsttl)) + { zonecut = savezonecut(&fzonecut, nextname); remove_sigs(nextnode, true, 0); if (generateds) { add_ds(nextname, nextnode, nsttl); } if (OPTOUT(nsec3flags) && - !secure(nextname, nextnode)) { + !secure(nextname, nextnode)) + { dns_db_detachnode(gdb, &nextnode); result = dns_dbiterator_next(dbiter); continue; @@ -2593,10 +2610,12 @@ nsec3ify(unsigned int hashalg, dns_iterations_t iterations, continue; } if (is_delegation(gdb, gversion, gorigin, nextname, - nextnode, NULL)) { + nextnode, NULL)) + { zonecut = savezonecut(&fzonecut, nextname); if (OPTOUT(nsec3flags) && - !secure(nextname, nextnode)) { + !secure(nextname, nextnode)) + { dns_db_detachnode(gdb, &nextnode); result = dns_dbiterator_next(dbiter); continue; @@ -2774,7 +2793,8 @@ loadexplicitkeys(char *keyfiles[], int n, bool setksk) { /* Skip any duplicates */ for (key = ISC_LIST_HEAD(keylist); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { if (dst_key_id(key->key) == dst_key_id(newkey) && dst_key_alg(key->key) == dst_key_alg(newkey)) { @@ -3115,7 +3135,8 @@ writeset(const char *prefix, dns_rdatatype_t type) { name = gorigin; for (key = ISC_LIST_HEAD(keylist); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { if (REVOKE(key->key)) { continue; } @@ -3794,7 +3815,8 @@ main(int argc, char *argv[]) { outputformat = dns_masterformat_raw; rawversion = strtol(outputformatstr + 4, &end, 10); if (end == outputformatstr + 4 || *end != '\0' || - rawversion > 1U) { + rawversion > 1U) + { fprintf(stderr, "unknown raw format version\n"); exit(1); } @@ -3903,7 +3925,8 @@ main(int argc, char *argv[]) { /* Now enumerate the key list */ for (key = ISC_LIST_HEAD(keylist); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { key->index = keycount++; } diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index 5a39976490d..bfd9ad7e1e4 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -315,7 +315,8 @@ strtotime(const char *str, int64_t now, int64_t base, bool *setp) { */ n = strspn(str, "0123456789"); if ((n == 8u || n == 14u) && - (str[n] == '\0' || str[n] == '-' || str[n] == '+')) { + (str[n] == '\0' || str[n] == '-' || str[n] == '+')) + { char timestr[15]; strlcpy(timestr, str, sizeof(timestr)); @@ -331,7 +332,8 @@ strtotime(const char *str, int64_t now, int64_t base, bool *setp) { base = val; str += n; } else if (n == 10u && - (str[n] == '\0' || str[n] == '-' || str[n] == '+')) { + (str[n] == '\0' || str[n] == '-' || str[n] == '+')) + { base = strtoll(str, &endp, 0); str += 10; } else if (strncmp(str, "now", 3) == 0) { diff --git a/bin/named/builtin.c b/bin/named/builtin.c index db8435788aa..cf18030d1ea 100644 --- a/bin/named/builtin.c +++ b/bin/named/builtin.c @@ -302,7 +302,8 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, * Reverse of 192.0.0.170 or 192.0.0.171 maps to ipv4only.arpa. */ if ((v[0] == 170 || v[0] == 171) && v[1] == 0 && v[2] == 0 && - v[3] == 192) { + v[3] == 192) + { return (dns_sdb_putrdata(lookup, dns_rdatatype_ptr, 3600, ipv4only, sizeof(ipv4only))); } diff --git a/bin/named/config.c b/bin/named/config.c index e2b5006c565..17b01ec9e16 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -394,7 +394,8 @@ named_checknames_get(const cfg_obj_t **maps, const char *const names[], for (i = 0; maps[i] != NULL; i++) { checknames = NULL; if (cfg_map_get(maps[i], "check-names", &checknames) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { /* * Zone map entry is not a list. */ @@ -410,7 +411,8 @@ named_checknames_get(const cfg_obj_t **maps, const char *const names[], for (size_t j = 0; names[j] != NULL; j++) { if (strcasecmp(cfg_obj_asstring(type), - names[j]) == 0) { + names[j]) == 0) + { *obj = cfg_tuple_get(value, "mode"); return (ISC_R_SUCCESS); @@ -483,7 +485,8 @@ named_config_getzonetype(const cfg_obj_t *zonetypeobj) { if (strcasecmp(str, "primary") == 0 || strcasecmp(str, "master") == 0) { ztype = dns_zone_primary; } else if (strcasecmp(str, "secondary") == 0 || - strcasecmp(str, "slave") == 0) { + strcasecmp(str, "slave") == 0) + { ztype = dns_zone_secondary; } else if (strcasecmp(str, "mirror") == 0) { ztype = dns_zone_mirror; @@ -621,7 +624,8 @@ getremotesdef(const cfg_obj_t *cctx, const char *list, const char *name, while (elt != NULL) { obj = cfg_listelt_value(elt); if (strcasecmp(cfg_obj_asstring(cfg_tuple_get(obj, "name")), - name) == 0) { + name) == 0) + { *ret = obj; return (ISC_R_SUCCESS); } diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c index 2319a91e689..65650ae7a77 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -469,7 +469,8 @@ control_recvmessage(isc_nmhandle_t *handle, isc_result_t result, void *arg) { if (isccc_cc_lookupuint32(conn->ctrl, "_tim", &sent) == ISC_R_SUCCESS) { if ((sent + CLOCKSKEW) < conn->now || - (sent - CLOCKSKEW) > conn->now) { + (sent - CLOCKSKEW) > conn->now) + { log_invalid(&conn->ccmsg, ISCCC_R_CLOCKSKEW); goto cleanup; } @@ -916,7 +917,8 @@ get_key_info(const cfg_obj_t *config, const cfg_obj_t *control, control_keylist = cfg_tuple_get(control, "keys"); if (!cfg_obj_isvoid(control_keylist) && - cfg_list_first(control_keylist) != NULL) { + cfg_list_first(control_keylist) != NULL) + { result = cfg_map_get(config, "key", &global_keylist); if (result == ISC_R_SUCCESS) { diff --git a/bin/named/log.c b/bin/named/log.c index 4270549b6b6..71e318efef7 100644 --- a/bin/named/log.c +++ b/bin/named/log.c @@ -201,7 +201,8 @@ named_log_setdefaultsslkeylogfile(isc_logconfig_t *lcfg) { isc_result_t result; if (sslkeylogfile_path == NULL || - strcmp(sslkeylogfile_path, "config") == 0) { + strcmp(sslkeylogfile_path, "config") == 0) + { return; } diff --git a/bin/named/main.c b/bin/named/main.c index 606c3ea858b..9d0207a3b83 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -440,7 +440,8 @@ set_flags(const char *arg, struct flag_def *defs, unsigned int *ret) { arglen = (int)(end - arg); for (def = defs; def->name != NULL; def++) { if (arglen == (int)strlen(def->name) && - memcmp(arg, def->name, arglen) == 0) { + memcmp(arg, def->name, arglen) == 0) + { if (def->value == 0) { clear = true; } @@ -494,14 +495,16 @@ static void list_hmac_algorithms(isc_buffer_t *b) { isc_buffer_t sb = *b; for (dst_algorithm_t i = DST_ALG_HMAC_FIRST; i <= DST_ALG_HMAC_LAST; - i++) { + i++) + { if (dst_algorithm_supported(i)) { isc_buffer_putstr(b, " "); isc_buffer_putstr(b, dst_hmac_algorithm_totext(i)); } } for (unsigned char *s = isc_buffer_used(&sb); s != isc_buffer_used(b); - s++) { + s++) + { *s = toupper(*s); } } diff --git a/bin/named/server.c b/bin/named/server.c index 698e20d1d0d..2494b314ef3 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -965,7 +965,8 @@ process_key(const cfg_obj_t *key, dns_keytable_t *secroots, * warning, but do not prevent further keys from being processed. */ if (!dns_resolver_algorithm_supported(view->resolver, keyname, - ds.algorithm)) { + ds.algorithm)) + { cfg_obj_log(key, named_g_lctx, ISC_LOG_WARNING, "ignoring %s for '%s': algorithm is disabled", initializing ? "initial-key" : "static-key", @@ -1007,7 +1008,8 @@ load_view_keys(const cfg_obj_t *keys, dns_view_t *view, bool managed, keylist = cfg_listelt_value(elt); for (elt2 = cfg_list_first(keylist); elt2 != NULL; - elt2 = cfg_list_next(elt2)) { + elt2 = cfg_list_next(elt2)) + { CHECK(process_key(cfg_listelt_value(elt2), secroots, keyname, view, managed)); } @@ -1075,7 +1077,8 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, /* We don't need trust anchors for the _bind view */ if (strcmp(view->name, "_bind") == 0 && - view->rdclass == dns_rdataclass_chaos) { + view->rdclass == dns_rdataclass_chaos) + { return (ISC_R_SUCCESS); } @@ -2062,7 +2065,8 @@ conf_dnsrps_get(const cfg_obj_t **sub_obj, const cfg_obj_t **maps, if (cfg_obj_isvoid(*sub_obj)) { *sub_obj = NULL; if (maps != NULL && - ISC_R_SUCCESS != named_config_get(maps, name, sub_obj)) { + ISC_R_SUCCESS != named_config_get(maps, name, sub_obj)) + { *sub_obj = NULL; } } @@ -2208,7 +2212,8 @@ conf_dnsrps(dns_view_t *view, const cfg_obj_t **maps, bool nsip_enabled, * statement in the view and the general options. */ if (conf_dnsrps_get(&obj, maps, rpz_obj, "dnsrps-options", &ctx) && - obj != NULL) { + obj != NULL) + { conf_dnsrps_sadd(&ctx, " %s\n", cfg_obj_asstring(obj)); } @@ -2285,7 +2290,8 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, obj = cfg_tuple_get(rpz_obj, "recursive-only"); if (cfg_obj_isvoid(obj) ? recursive_only_default - : cfg_obj_asboolean(obj)) { + : cfg_obj_asboolean(obj)) + { view->rpzs->p.no_rd_ok &= ~DNS_RPZ_ZBIT(zone->num); } else { view->rpzs->p.no_rd_ok |= DNS_RPZ_ZBIT(zone->num); @@ -2328,9 +2334,11 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, } if (!view->rpzs->p.dnsrps_enabled) { for (rpz_num = 0; rpz_num < view->rpzs->p.num_zones - 1; - ++rpz_num) { + ++rpz_num) + { if (dns_name_equal(&view->rpzs->zones[rpz_num]->origin, - &zone->origin)) { + &zone->origin)) + { cfg_obj_log(rpz_obj, named_g_lctx, DNS_RPZ_ERROR_LEVEL, "duplicate '%s'", str); @@ -2638,10 +2646,12 @@ configure_rpz(dns_view_t *view, dns_view_t *pview, const cfg_obj_t **maps, */ if (*old_rpz_okp) { if (old != NULL && - memcmp(&old->p, &zones->p, sizeof(zones->p)) != 0) { + memcmp(&old->p, &zones->p, sizeof(zones->p)) != 0) + { *old_rpz_okp = false; } else if ((old == NULL || old->rps_cstr == NULL) != - (zones->rps_cstr == NULL)) { + (zones->rps_cstr == NULL)) + { *old_rpz_okp = false; } else if (old != NULL && zones->rps_cstr != NULL && strcmp(old->rps_cstr, zones->rps_cstr) != 0) @@ -2701,7 +2711,8 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { result = dns_fwdtable_find(ev->view->fwdtable, name, NULL, &dnsforwarders); if (result == ISC_R_SUCCESS && - dnsforwarders->fwdpolicy == dns_fwdpolicy_only) { + dnsforwarders->fwdpolicy == dns_fwdpolicy_only) + { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "catz: catz_addmodzone_taskaction: " @@ -2784,7 +2795,8 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { } goto cleanup; } else if (result != ISC_R_NOTFOUND && - result != DNS_R_PARTIALMATCH) { + result != DNS_R_PARTIALMATCH) + { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "catz: error \"%s\" while trying to " @@ -3502,7 +3514,8 @@ create_empty_zone(dns_zone_t *pzone, dns_name_t *name, dns_view_t *view, obj = NULL; (void)cfg_map_get(zoptions, "type", &obj); if (obj != NULL && - strcasecmp(cfg_obj_asstring(obj), "forward") == 0) { + strcasecmp(cfg_obj_asstring(obj), "forward") == 0) + { obj = NULL; (void)cfg_map_get(zoptions, "forward", &obj); if (obj == NULL) { @@ -3552,7 +3565,8 @@ create_empty_zone(dns_zone_t *pzone, dns_name_t *name, dns_view_t *view, } if (pzone != NULL && - dns_zone_gettype(pzone) != dns_zone_primary) { + dns_zone_gettype(pzone) != dns_zone_primary) + { pzone = NULL; } if (pzone != NULL && dns_zone_getfile(pzone) != NULL) { @@ -4685,7 +4699,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, } if (pview != NULL) { if (!cache_reusable(pview, view, - zero_no_soattl)) { + zero_no_soattl)) + { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, @@ -4812,7 +4827,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, max_adb_size = 1; /* Force minimum. */ } if (view != nsc->primaryview && - max_adb_size > MAX_ADB_SIZE_FOR_CACHESHARE) { + max_adb_size > MAX_ADB_SIZE_FOR_CACHESHARE) + { max_adb_size = MAX_ADB_SIZE_FOR_CACHESHARE; if (!nsc->adbsizeadjusted) { dns_adb_setadbsize(nsc->primaryview->adb, @@ -5289,7 +5305,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, NULL, actx, named_g_mctx, &view->cacheonacl)); if (strcmp(view->name, "_bind") != 0 && - view->rdclass != dns_rdataclass_chaos) { + view->rdclass != dns_rdataclass_chaos) + { /* named.conf only */ CHECK(configure_view_acl(vconfig, config, NULL, "allow-recursion", NULL, actx, @@ -5715,7 +5732,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, (void)named_config_get(maps, "empty-zones-enable", &obj); (void)named_config_get(maps, "disable-empty-zone", &disablelist); if (obj == NULL && disablelist == NULL && - view->rdclass == dns_rdataclass_in) { + view->rdclass == dns_rdataclass_in) + { empty_zones_enable = view->recursion; } else if (view->rdclass == dns_rdataclass_in) { if (obj != NULL) { @@ -5800,7 +5818,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, */ CHECK(dns_name_fromstring(name, empty, 0, NULL)); if (disablelist != NULL && - on_disable_list(disablelist, name)) { + on_disable_list(disablelist, name)) + { continue; } @@ -5890,7 +5909,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, name = dns_fixedname_initname(&fixed); for (ipv4only_zone = 0; ipv4only_zone < ARRAY_SIZE(zones); - ipv4only_zone++) { + ipv4only_zone++) + { dns_forwarders_t *dnsforwarders = NULL; CHECK(dns_name_fromstring( @@ -6740,7 +6760,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, } if (view->catzs != NULL && - dns_catz_get_zone(view->catzs, origin) != NULL) { + dns_catz_get_zone(view->catzs, origin) != NULL) + { zone_is_catz = true; } @@ -8962,7 +8983,8 @@ load_configuration(const char *filename, named_server_t *server, isc_nm_setloadbalancesockets(named_g_netmgr, cfg_obj_asboolean(obj)); } else if (loadbalancesockets != - isc_nm_getloadbalancesockets(named_g_netmgr)) { + isc_nm_getloadbalancesockets(named_g_netmgr)) + { cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "changing reuseport value requires server restart"); } @@ -9679,7 +9701,8 @@ load_configuration(const char *filename, named_server_t *server, sizeof(server->sctx->secret)); result = isc_hex_decodestring(str, &b); if (result != ISC_R_SUCCESS && - result != ISC_R_NOSPACE) { + result != ISC_R_NOSPACE) + { goto cleanup_altsecrets; } first = false; @@ -9690,7 +9713,8 @@ load_configuration(const char *filename, named_server_t *server, sizeof(altsecret->secret)); result = isc_hex_decodestring(str, &b); if (result != ISC_R_SUCCESS && - result != ISC_R_NOSPACE) { + result != ISC_R_NOSPACE) + { isc_mem_put(server->sctx->mctx, altsecret, sizeof(*altsecret)); @@ -9829,7 +9853,8 @@ cleanup_cachelist: cleanup_viewlist: for (dns_view_t *view = ISC_LIST_HEAD(viewlist); view != NULL; - view = view_next) { + view = view_next) + { view_next = ISC_LIST_NEXT(view, link); ISC_LIST_UNLINK(viewlist, view, link); if (result == ISC_R_SUCCESS && strcmp(view->name, "_bind") != 0) @@ -10147,14 +10172,16 @@ shutdown_server(isc_task_t *task, isc_event_t *event) { (void)named_server_saventa(server); for (kasp = ISC_LIST_HEAD(server->kasplist); kasp != NULL; - kasp = kasp_next) { + kasp = kasp_next) + { kasp_next = ISC_LIST_NEXT(kasp, link); ISC_LIST_UNLINK(server->kasplist, kasp, link); dns_kasp_detach(&kasp); } for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = view_next) { + view = view_next) + { view_next = ISC_LIST_NEXT(view, link); ISC_LIST_UNLINK(server->viewlist, view, link); dns_view_flushonshutdown(view, flush); @@ -10242,7 +10269,8 @@ get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, view = ISC_LIST_NEXT(view, link)) { if (message->rdclass == view->rdclass || - message->rdclass == dns_rdataclass_any) { + message->rdclass == dns_rdataclass_any) + { const dns_name_t *tsig = NULL; *sigresult = dns_message_rechecksig(message, view); @@ -10662,7 +10690,8 @@ next_token(isc_lex_t *lex, isc_buffer_t **text) { } if (token.type == isc_tokentype_string || - token.type == isc_tokentype_qstring) { + token.type == isc_tokentype_qstring) + { return (token.value.as_textregion.base); } @@ -11134,10 +11163,12 @@ find_maplist(const cfg_obj_t *config, const char *listname, const char *name) { } for (elt = cfg_list_first(maplist); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { const cfg_obj_t *map = cfg_listelt_value(elt); if (strcasecmp(cfg_obj_asstring(cfg_map_getname(map)), name) == - 0) { + 0) + { return (map); } } @@ -11211,12 +11242,14 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, cert = cfg_obj_asstring(certobj); if (cfg_map_get(tlsmap, "ca-file", &ca_obj) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { ca_file = cfg_obj_asstring(ca_obj); } if (cfg_map_get(tlsmap, "protocols", &tls_proto_list) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { const cfg_listelt_t *proto = NULL; INSIST(tls_proto_list != NULL); for (proto = cfg_list_first(tls_proto_list); @@ -11238,12 +11271,14 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, } if (cfg_map_get(tlsmap, "dhparam-file", &dhparam_obj) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { dhparam_file = cfg_obj_asstring(dhparam_obj); } if (cfg_map_get(tlsmap, "ciphers", &ciphers_obj) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { ciphers = cfg_obj_asstring(ciphers_obj); } @@ -11426,7 +11461,8 @@ listenelt_http(const cfg_obj_t *http, const uint16_t family, bool tls, } if (cfg_map_get(http, "listener-clients", &cfg_max_clients) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { INSIST(cfg_max_clients != NULL); max_clients = cfg_obj_asuint32(cfg_max_clients); } @@ -11443,7 +11479,8 @@ listenelt_http(const cfg_obj_t *http, const uint16_t family, bool tls, if (http != NULL && eplist != NULL) { for (elt = cfg_list_first(eplist); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { const cfg_obj_t *ep = cfg_listelt_value(elt); const char *path = cfg_obj_asstring(ep); endpoints[i++] = isc_mem_strdup(mctx, path); @@ -12844,7 +12881,8 @@ named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { arg = next_token(lex, text); if (arg != NULL && - (strcmp(arg, "-clean") == 0 || strcmp(arg, "-clear") == 0)) { + (strcmp(arg, "-clean") == 0 || strcmp(arg, "-clear") == 0)) + { cleanup = true; arg = next_token(lex, text); } @@ -12885,7 +12923,8 @@ named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { view = dns_zone_getview(zone); if (strcmp(view->name, "_default") == 0 || - strcmp(view->name, "_bind") == 0) { + strcmp(view->name, "_bind") == 0) + { vname = ""; sep = ""; } else { @@ -13011,7 +13050,8 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex, view = dns_zone_getview(mayberaw); if (strcmp(view->name, "_default") == 0 || - strcmp(view->name, "_bind") == 0) { + strcmp(view->name, "_bind") == 0) + { vname = ""; sep = ""; } else { @@ -13149,7 +13189,8 @@ nzf_writeconf(const cfg_obj_t *config, dns_view_t *view) { CHECK(add_comment(fp, view->name)); /* force a comment */ for (elt = ISC_LIST_HEAD(*list); elt != NULL; - elt = ISC_LIST_NEXT(elt, link)) { + elt = ISC_LIST_NEXT(elt, link)) + { const cfg_obj_t *zconfig = cfg_listelt_value(elt); CHECK(isc_stdio_write("zone ", 5, 1, fp, NULL)); @@ -13837,7 +13878,8 @@ delete_zoneconf(dns_view_t *view, cfg_parser_t *pctx, const cfg_obj_t *config, myname = dns_fixedname_initname(&myfixed); for (elt = ISC_LIST_HEAD(*list); elt != NULL; - elt = ISC_LIST_NEXT(elt, link)) { + elt = ISC_LIST_NEXT(elt, link)) + { const cfg_obj_t *zconf = cfg_listelt_value(elt); const char *zn; cfg_listelt_t *e; @@ -14723,7 +14765,8 @@ find_name_in_list_from_map(const cfg_obj_t *config, if (name1 != NULL) { result = dns_name_fromstring(name2, vname, 0, NULL); if (result == ISC_R_SUCCESS && - dns_name_equal(name1, name2)) { + dns_name_equal(name1, name2)) + { const cfg_obj_t *zoptions; const cfg_obj_t *typeobj = NULL; zoptions = cfg_tuple_get(obj, "options"); @@ -14937,7 +14980,8 @@ named_server_signing(named_server_t *server, isc_lex_t *lex, if (strcasecmp(ptr, "-list") == 0) { list = true; } else if ((strcasecmp(ptr, "-clear") == 0) || - (strcasecmp(ptr, "-clean") == 0)) { + (strcasecmp(ptr, "-clean") == 0)) + { clear = true; ptr = next_token(lex, text); if (ptr == NULL) { @@ -14981,7 +15025,8 @@ named_server_signing(named_server_t *server, isc_lex_t *lex, } if (hash > 0xffU || flags > 0xffU || - iter > dns_nsec3_maxiterations()) { + iter > dns_nsec3_maxiterations()) + { return (ISC_R_RANGE); } @@ -15572,7 +15617,8 @@ named_server_zonestatus(named_server_t *server, isc_lex_t *lex, /* Key refresh time */ if (zonetype == dns_zone_primary || - (zonetype == dns_zone_secondary && hasraw)) { + (zonetype == dns_zone_secondary && hasraw)) + { dns_zone_getrefreshkeytime(zone, &refreshkeytime); isc_time_formathttptimestamp(&refreshkeytime, kbuf, sizeof(kbuf)); diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index 9484c2870ef..20b88a86cd2 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -1464,7 +1464,8 @@ rdtypestat_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) { #endif /* ifdef HAVE_JSON_C */ if ((DNS_RDATASTATSTYPE_ATTR(type) & - DNS_RDATASTATSTYPE_ATTR_OTHERTYPE) == 0) { + DNS_RDATASTATSTYPE_ATTR_OTHERTYPE) == 0) + { dns_rdatatype_format(DNS_RDATASTATSTYPE_BASE(type), typebuf, sizeof(typebuf)); typestr = typebuf; @@ -1536,7 +1537,8 @@ rdatasetstats_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) { #endif /* ifdef HAVE_JSON_C */ if ((DNS_RDATASTATSTYPE_ATTR(type) & - DNS_RDATASTATSTYPE_ATTR_NXDOMAIN) != 0) { + DNS_RDATASTATSTYPE_ATTR_NXDOMAIN) != 0) + { typestr = "NXDOMAIN"; } else if ((DNS_RDATASTATSTYPE_ATTR(type) & DNS_RDATASTATSTYPE_ATTR_OTHERTYPE) != 0) @@ -2243,7 +2245,8 @@ generatexml(named_server_t *server, uint32_t flags, int *buflen, view = ISC_LIST_HEAD(server->viewlist); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "views")); while (view != NULL && - ((flags & (STATS_XML_SERVER | STATS_XML_ZONES)) != 0)) { + ((flags & (STATS_XML_SERVER | STATS_XML_ZONES)) != 0)) + { isc_stats_t *istats = NULL; dns_stats_t *dstats = NULL; @@ -2729,7 +2732,8 @@ zone_jsonrender(dns_zone_t *zone, void *arg) { } if (json_object_get_object(refresh_counters)->count != - 0) { + 0) + { json_object_object_add(zoneobj, "dnssec-refresh", refresh_counters); diff --git a/bin/named/transportconf.c b/bin/named/transportconf.c index 8d3153c7724..f24aab11dd4 100644 --- a/bin/named/transportconf.c +++ b/bin/named/transportconf.c @@ -59,7 +59,8 @@ const cfg_listelt_t *proto = NULL; \ INSIST(obj != NULL); \ for (proto = cfg_list_first(obj); proto != 0; \ - proto = cfg_list_next(proto)) { \ + proto = cfg_list_next(proto)) \ + { \ const cfg_obj_t *tls_proto_obj = \ cfg_listelt_value(proto); \ const char *tls_sver = \ diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c index 1957fecc7bf..6d596ab27ff 100644 --- a/bin/named/tsigconf.c +++ b/bin/named/tsigconf.c @@ -84,7 +84,8 @@ add_initial_keys(const cfg_obj_t *list, dns_tsig_keyring_t *ring, */ algstr = cfg_obj_asstring(algobj); if (named_config_getkeyalgorithm(algstr, &alg, &bits) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { cfg_obj_log(algobj, named_g_lctx, ISC_LOG_ERROR, "key '%s': has a " "unsupported algorithm '%s'", diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 630fb36aa6f..f7e5914fbd2 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -251,7 +251,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, str = cfg_obj_asstring(matchtype); CHECK(dns_ssu_mtypefromstring(str, &mtype)); if (mtype == dns_ssumatchtype_subdomain && - strcasecmp(str, "zonesub") == 0) { + strcasecmp(str, "zonesub") == 0) + { usezone = true; } @@ -313,7 +314,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, r.length = bracket - str; max = strtoul(bracket + 1, &end, 10); if (max > 0xffff || end[0] != /*(*/ ')' || - end[1] != 0) { + end[1] != 0) + { cfg_obj_log(identity, named_g_lctx, ISC_LOG_ERROR, "'%s' is not a valid count", @@ -454,7 +456,8 @@ configure_staticstub_serveraddrs(const cfg_obj_t *zconfig, dns_zone_t *zone, * there's nothing to do anymore. */ if (ISC_LIST_EMPTY(rdatalist_a->rdata) && - ISC_LIST_EMPTY(rdatalist_aaaa->rdata)) { + ISC_LIST_EMPTY(rdatalist_aaaa->rdata)) + { return (ISC_R_SUCCESS); } @@ -1012,7 +1015,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, * will be needing a master file. */ if (ztype == dns_zone_primary && cpval == default_dbtype && - filename == NULL) { + filename == NULL) + { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "zone '%s': 'file' not specified", zname); diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index e1504499626..de98154ef0e 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -889,7 +889,8 @@ setup_system(void) { */ ns_total = 0; for (sa = ISC_LIST_HEAD(*nslist); sa != NULL; - sa = ISC_LIST_NEXT(sa, link)) { + sa = ISC_LIST_NEXT(sa, link)) + { switch (sa->type.sa.sa_family) { case AF_INET: if (have_ipv4) { @@ -911,7 +912,8 @@ setup_system(void) { i = 0; for (sa = ISC_LIST_HEAD(*nslist); sa != NULL; - sa = ISC_LIST_NEXT(sa, link)) { + sa = ISC_LIST_NEXT(sa, link)) + { switch (sa->type.sa.sa_family) { case AF_INET: if (have_ipv4) { @@ -1296,7 +1298,8 @@ parse_args(int argc, char **argv) { if (use_tls) { if ((tls_client_key_file == NULL) != - (tls_client_cert_file == NULL)) { + (tls_client_cert_file == NULL)) + { fprintf(stderr, "%s: cannot specify the -K option without" "the -E option, and vice versa.\n", @@ -2001,7 +2004,8 @@ parseclass: dns_name_t *bad; if (!dns_rdata_checkowner(name, rdata->rdclass, rdata->type, - true)) { + true)) + { char namebuf[DNS_NAME_FORMATSIZE]; dns_name_format(name, namebuf, sizeof(namebuf)); @@ -2298,11 +2302,13 @@ do_next_command(char *cmdline) { return (evaluate_realm(cmdline)); } if (strcasecmp(word, "check-names") == 0 || - strcasecmp(word, "checknames") == 0) { + strcasecmp(word, "checknames") == 0) + { return (evaluate_checknames(cmdline)); } if (strcasecmp(word, "check-svcb") == 0 || - strcasecmp(word, "checksvcb") == 0) { + strcasecmp(word, "checksvcb") == 0) + { return (evaluate_checksvcb(cmdline)); } if (strcasecmp(word, "gsstsig") == 0) { @@ -2778,7 +2784,8 @@ recvsoa(isc_task_t *task, isc_event_t *event) { } if (rcvmsg->rcode != dns_rcode_noerror && - rcvmsg->rcode != dns_rcode_nxdomain) { + rcvmsg->rcode != dns_rcode_nxdomain) + { fatal("response to SOA query was unsuccessful"); } @@ -3284,7 +3291,8 @@ recvgss(isc_task_t *task, isc_event_t *event) { } if (rcvmsg->rcode != dns_rcode_noerror && - rcvmsg->rcode != dns_rcode_nxdomain) { + rcvmsg->rcode != dns_rcode_nxdomain) + { fatal("response to GSS-TSIG query was unsuccessful"); } diff --git a/bin/plugins/filter-a.c b/bin/plugins/filter-a.c index db8c99f60aa..4836110238f 100644 --- a/bin/plugins/filter-a.c +++ b/bin/plugins/filter-a.c @@ -619,7 +619,8 @@ process_section(const section_filter_t *filter) { } if (section == DNS_SECTION_ANSWER || - section == DNS_SECTION_AUTHORITY) { + section == DNS_SECTION_AUTHORITY) + { message->flags &= ~DNS_MESSAGEFLAG_AD; } } @@ -669,7 +670,8 @@ filter_prep_response_begin(void *arg, void *cbdata, isc_result_t *resp) { result = ns_client_checkaclsilent(qctx->client, NULL, inst->a_acl, true); if (result == ISC_R_SUCCESS && inst->v4_a != NONE && - is_v4_client(qctx->client)) { + is_v4_client(qctx->client)) + { client_state->mode = inst->v4_a; } else if (result == ISC_R_SUCCESS && inst->v6_a != NONE && is_v6_client(qctx->client)) diff --git a/bin/plugins/filter-aaaa.c b/bin/plugins/filter-aaaa.c index f3de2c6e544..9a1c62a57e7 100644 --- a/bin/plugins/filter-aaaa.c +++ b/bin/plugins/filter-aaaa.c @@ -623,7 +623,8 @@ process_section(const section_filter_t *filter) { } if (section == DNS_SECTION_ANSWER || - section == DNS_SECTION_AUTHORITY) { + section == DNS_SECTION_AUTHORITY) + { message->flags &= ~DNS_MESSAGEFLAG_AD; } } diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index ff7b9e8e551..56128457532 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -688,7 +688,8 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, (void)cfg_map_get(config, "server", &servers); if (servers != NULL) { for (elt = cfg_list_first(servers); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { const char *name = NULL; server = cfg_listelt_value(elt); name = cfg_obj_asstring( @@ -725,7 +726,8 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, } else { DO("get config key list", cfg_map_get(config, "key", &keys)); for (elt = cfg_list_first(keys); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { const char *name = NULL; key = cfg_listelt_value(elt); @@ -935,11 +937,13 @@ main(int argc, char **argv) { break; case 'b': if (inet_pton(AF_INET, isc_commandline_argument, &in) == - 1) { + 1) + { isc_sockaddr_fromin(&local4, &in, 0); local4set = true; } else if (inet_pton(AF_INET6, isc_commandline_argument, - &in6) == 1) { + &in6) == 1) + { isc_sockaddr_fromin6(&local6, &in6, 0); local6set = true; } diff --git a/bin/tests/system/dlzexternal/driver/driver.c b/bin/tests/system/dlzexternal/driver/driver.c index b8c74244e6b..20edfd03e4f 100644 --- a/bin/tests/system/dlzexternal/driver/driver.c +++ b/bin/tests/system/dlzexternal/driver/driver.c @@ -520,7 +520,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, } if (strcmp(name, "too-long") == 0 || - strcmp(zone, "bigcname.domain") == 0) { + strcmp(zone, "bigcname.domain") == 0) + { for (i = 0; i < 511; i++) { buf[i] = 'x'; } @@ -542,7 +543,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, } if (strcmp(name, "long.name.is.not.there") == 0 && - strcmp(zone, ".") == 0) { + strcmp(zone, ".") == 0) + { result = state->putrr(lookup, "A", 0, "100.100.100.3"); found = true; if (result != ISC_R_SUCCESS) { diff --git a/bin/tests/system/dyndb/driver/db.c b/bin/tests/system/dyndb/driver/db.c index 7641751f790..4c2366dc417 100644 --- a/bin/tests/system/dyndb/driver/db.c +++ b/bin/tests/system/dyndb/driver/db.c @@ -325,7 +325,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, CHECK(dns_db_addrdataset(sampledb->rbtdb, node, version, now, rdataset, options, addedrdataset)); if (rdataset->type == dns_rdatatype_a || - rdataset->type == dns_rdatatype_aaaa) { + rdataset->type == dns_rdatatype_aaaa) + { CHECK(sample_name_fromnode(node, dns_fixedname_name(&name))); CHECK(syncptrs(sampledb->inst, dns_fixedname_name(&name), rdataset, DNS_DIFFOP_ADD)); @@ -353,7 +354,8 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } if (rdataset->type == dns_rdatatype_a || - rdataset->type == dns_rdatatype_aaaa) { + rdataset->type == dns_rdatatype_aaaa) + { CHECK(sample_name_fromnode(node, dns_fixedname_name(&name))); CHECK(syncptrs(sampledb->inst, dns_fixedname_name(&name), rdataset, DNS_DIFFOP_DEL)); diff --git a/bin/tests/system/rpz/dnsrps.c b/bin/tests/system/rpz/dnsrps.c index 4f8890873df..55d8a9106c8 100644 --- a/bin/tests/system/rpz/dnsrps.c +++ b/bin/tests/system/rpz/dnsrps.c @@ -118,7 +118,8 @@ main(int argc, char **argv) { rsp = NULL; if (!librpz->rsp_create(&emsg, &rsp, NULL, client, true, false) || - rsp == NULL) { + rsp == NULL) + { fprintf(stderr, "## %s\n", emsg.c); librpz->client_detach(&client); return (1); diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c index fa6f7eae1dd..8729fad89f2 100644 --- a/bin/tests/wire_test.c +++ b/bin/tests/wire_test.c @@ -202,7 +202,8 @@ main(int argc, char *argv[]) { break; } if (*rp != ' ' && *rp != '\t' && *rp != '\r' && - *rp != '\n') { + *rp != '\n') + { *wp++ = *rp; len++; } diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index e0214cd816a..b71e009fa5d 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -475,7 +475,8 @@ repopulate_buffer: dns_rdataset_next(rdataset); dns_rdata_reset(&rdata); if (strlen("\n") >= - isc_buffer_availablelength(buf)) { + isc_buffer_availablelength(buf)) + { goto buftoosmall; } isc_buffer_putstr(buf, "\n"); @@ -1885,7 +1886,8 @@ preparse_args(int argc, char **argv) { } /* Look for dash value option. */ if (strpbrk(option, dash_opts) != &option[0] || - strlen(option) > 1U) { + strlen(option) > 1U) + { /* Error or value in option. */ continue; } @@ -1972,13 +1974,15 @@ parse_args(bool is_batchfile, int argc, char **argv) { if (rc <= 1) { if (dash_option(&rv[0][1], NULL, query, global, - &setname)) { + &setname)) + { rc--; rv++; } } else { if (dash_option(&rv[0][1], rv[1], query, global, - &setname)) { + &setname)) + { rc--; rv++; } diff --git a/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c b/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c index 4c7c81003eb..e84f866136e 100644 --- a/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c +++ b/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c @@ -385,7 +385,8 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { /* split string into dns data parts. */ if (bdbhpt_parse_data(db->log, tmp, &pd) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { goto allnodes_cleanup; } result = db->putnamedrr(allnodes, pd.host, pd.type, @@ -575,7 +576,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, flags = DB_SET; while ((bdbhptres = data_cursor->c_get(data_cursor, &key, &data, - flags)) == 0) { + flags)) == 0) + { flags = DB_NEXT_DUP; tmp = realloc(tmp, data.size + 1); if (tmp == NULL) { diff --git a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c index 34aa26ba942..3b8a8bbc689 100644 --- a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c +++ b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c @@ -175,7 +175,8 @@ create_path_helper(char *out, const char *in, config_data_t *cd) { break; } if (strlen((char *)&tmpPtr[i + 1]) <= - (unsigned int)cd->splitcnt) { + (unsigned int)cd->splitcnt) + { break; } i += cd->splitcnt; @@ -386,10 +387,12 @@ process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, */ while ((tmpPtr = strrchr( tmpString, - cd->pathsep)) != NULL) { + cd->pathsep)) != NULL) + { if ((strlen(host) + strlen(tmpPtr + 1) + 2) > - DIR_NAMEMAX) { + DIR_NAMEMAX) + { continue; } strcat(host, tmpPtr + 1); @@ -397,7 +400,8 @@ process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, tmpPtr[0] = '\0'; } if ((strlen(host) + strlen(tmpString) + - 1) <= DIR_NAMEMAX) { + 1) <= DIR_NAMEMAX) + { strcat(host, tmpString); } } @@ -413,13 +417,15 @@ process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, */ while (dir_read(dir) == ISC_R_SUCCESS) { if (strncasecmp(".host", dir->entry.name, 5) == - 0) { + 0) + { /* * handle filesystem's special * wildcard "-" */ if (strcmp((char *)&dir->entry.name[6], - "-") == 0) { + "-") == 0) + { strcpy(host, "*"); } else { strncpy(host, diff --git a/contrib/dlz/modules/perl/dlz_perl_driver.c b/contrib/dlz/modules/perl/dlz_perl_driver.c index 88edc0ced03..b99b296e998 100644 --- a/contrib/dlz/modules/perl/dlz_perl_driver.c +++ b/contrib/dlz/modules/perl/dlz_perl_driver.c @@ -169,7 +169,8 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { while (r++ < rrcount) { record_ref = POPs; if ((!SvROK(record_ref)) || - (SvTYPE(SvRV(record_ref)) != SVt_PVAV)) { + (SvTYPE(SvRV(record_ref)) != SVt_PVAV)) + { cd->log(ISC_LOG_ERROR, "DLZ Perl: allnodes for zone %s " "returned an invalid value " @@ -187,7 +188,8 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { rr_data = av_fetch((AV *)record_ref, 3, 0); if (rr_name == NULL || rr_type == NULL || rr_ttl == NULL || - rr_data == NULL) { + rr_data == NULL) + { cd->log(ISC_LOG_ERROR, "DLZ Perl: allnodes for zone %s " "returned an array that was missing data", @@ -424,7 +426,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, while (r++ < rrcount) { record_ref = POPs; if ((!SvROK(record_ref)) || - (SvTYPE(SvRV(record_ref)) != SVt_PVAV)) { + (SvTYPE(SvRV(record_ref)) != SVt_PVAV)) + { cd->log(ISC_LOG_ERROR, "DLZ Perl: lookup returned an " "invalid value (expected array " "of arrayrefs)!"); diff --git a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c index df22eaf6884..95221a1e5ef 100644 --- a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c +++ b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c @@ -265,7 +265,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, if (strcmp(cd->record, nrec->name) == 0) { /* We handle authority data in dlz_authority() */ if (strcmp(nrec->type, "SOA") == 0 || - strcmp(nrec->type, "NS") == 0) { + strcmp(nrec->type, "NS") == 0) + { nrec = next; continue; } @@ -641,7 +642,8 @@ fnmatch(const char *pattern, const char *string, int flags) { /* General case, use recursion. */ while ((test = *string) != EOS) { if (!fnmatch(pattern, string, - flags & ~FNM_PERIOD)) { + flags & ~FNM_PERIOD)) + { return (0); } if (test == '/' && flags & FNM_PATHNAME) { @@ -744,7 +746,8 @@ rangematch(const char *pattern, char test, int flags, char **newp) { } if (*pattern == '-' && (c2 = *(pattern + 1)) != EOS && - c2 != ']') { + c2 != ']') + { pattern += 2; if (c2 == '\\' && !(flags & FNM_NOESCAPE)) { c2 = *pattern++; diff --git a/doc/misc/cfg_test.c b/doc/misc/cfg_test.c index 661981f8ed9..d5f36549e27 100644 --- a/doc/misc/cfg_test.c +++ b/doc/misc/cfg_test.c @@ -110,10 +110,12 @@ main(int argc, char **argv) { usage(); } if (strcmp(argv[1], "master") == 0 || - strcmp(argv[1], "primary") == 0) { + strcmp(argv[1], "primary") == 0) + { zonetype = CFG_ZONE_PRIMARY; } else if (strcmp(argv[1], "slave") == 0 || - strcmp(argv[1], "secondary") == 0) { + strcmp(argv[1], "secondary") == 0) + { zonetype = CFG_ZONE_SECONDARY; } else if (strcmp(argv[1], "mirror") == 0) { zonetype = CFG_ZONE_MIRROR; diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 857f2dd997b..5776b939668 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -146,7 +146,8 @@ check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) { obj = cfg_tuple_get(ent, "order"); if (!cfg_obj_isstring(obj) || - strcasecmp("order", cfg_obj_asstring(obj)) != 0) { + strcasecmp("order", cfg_obj_asstring(obj)) != 0) + { cfg_obj_log(ent, logctx, ISC_LOG_ERROR, "rrset-order: keyword 'order' missing"); if (result == ISC_R_SUCCESS) { @@ -482,14 +483,16 @@ checkacl(const char *aclname, cfg_aclconfctx_t *actx, const cfg_obj_t *zconfig, } if (strcasecmp(aclname, "allow-transfer") == 0 && - cfg_obj_istuple(aclobj)) { + cfg_obj_istuple(aclobj)) + { const cfg_obj_t *obj_port = cfg_tuple_get( cfg_tuple_get(aclobj, "port-transport"), "port"); const cfg_obj_t *obj_proto = cfg_tuple_get( cfg_tuple_get(aclobj, "port-transport"), "transport"); if (cfg_obj_isuint32(obj_port) && - cfg_obj_asuint32(obj_port) >= UINT16_MAX) { + cfg_obj_asuint32(obj_port) >= UINT16_MAX) + { cfg_obj_log(obj_port, logctx, ISC_LOG_ERROR, "port value '%u' is out of range", @@ -968,10 +971,12 @@ find_maplist(const cfg_obj_t *config, const char *listname, const char *name) { } for (elt = cfg_list_first(maplist); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { const cfg_obj_t *map = cfg_listelt_value(elt); if (strcasecmp(cfg_obj_asstring(cfg_map_getname(map)), name) == - 0) { + 0) + { return (map); } } @@ -1040,7 +1045,8 @@ check_listener(const cfg_obj_t *listener, const cfg_obj_t *config, portobj = cfg_tuple_get(ltup, "port"); if (cfg_obj_isuint32(portobj) && - cfg_obj_asuint32(portobj) >= UINT16_MAX) { + cfg_obj_asuint32(portobj) >= UINT16_MAX) + { cfg_obj_log(portobj, logctx, ISC_LOG_ERROR, "port value '%u' is out of range", @@ -1309,7 +1315,8 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config, } for (kasp = ISC_LIST_HEAD(list); kasp != NULL; - kasp = kasp_next) { + kasp = kasp_next) + { kasp_next = ISC_LIST_NEXT(kasp, link); ISC_LIST_UNLINK(list, kasp, link); dns_kasp_detach(&kasp); @@ -1523,7 +1530,8 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config, tresult = mustbesecure(obj, symtab, logctx, mctx); if (result == ISC_R_SUCCESS && - tresult != ISC_R_SUCCESS) { + tresult != ISC_R_SUCCESS) + { result = tresult; } } @@ -1672,7 +1680,8 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config, usedlength = isc_buffer_usedlength(&b); if (strcasecmp(ccalg, "aes") == 0 && - usedlength != ISC_AES128_KEYLENGTH) { + usedlength != ISC_AES128_KEYLENGTH) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "AES cookie-secret must be 128 " "bits"); @@ -1709,7 +1718,8 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config, value = cfg_obj_asuint32(obj); } if (value < fstrm[i].min || - (fstrm[i].max != 0U && value > fstrm[i].max)) { + (fstrm[i].max != 0U && value > fstrm[i].max)) + { if (fstrm[i].max != 0U) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "%s '%u' out of range (%u..%u)", @@ -1766,7 +1776,8 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config, obj2 = cfg_tuple_get(obj, "size"); if (obj2 != NULL && !cfg_obj_isvoid(obj2) && - dmode == dns_dtmode_unix) { + dmode == dns_dtmode_unix) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "dnstap-output size " "cannot be set with mode unix"); @@ -1777,7 +1788,8 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config, obj2 = cfg_tuple_get(obj, "versions"); if (obj2 != NULL && !cfg_obj_isvoid(obj2) && - dmode == dns_dtmode_unix) { + dmode == dns_dtmode_unix) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "dnstap-output versions " "cannot be set with mode unix"); @@ -1788,7 +1800,8 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config, obj2 = cfg_tuple_get(obj, "suffix"); if (obj2 != NULL && !cfg_obj_isvoid(obj2) && - dmode == dns_dtmode_unix) { + dmode == dns_dtmode_unix) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "dnstap-output suffix " "cannot be set with mode unix"); @@ -2124,7 +2137,8 @@ bind9_check_httpserver(const cfg_obj_t *http, isc_log_t *logctx, tresult = cfg_map_get(http, "endpoints", &eps); if (tresult == ISC_R_SUCCESS) { for (elt = cfg_list_first(eps); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { const cfg_obj_t *ep = cfg_listelt_value(elt); const char *path = cfg_obj_asstring(ep); if (!isc_nm_http_path_isvalid(path)) { @@ -2546,7 +2560,8 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) { /* Check for "update-policy local;" */ if (cfg_obj_isstring(policy) && - strcmp("local", cfg_obj_asstring(policy)) == 0) { + strcmp("local", cfg_obj_asstring(policy)) == 0) + { return (ISC_R_SUCCESS); } @@ -2583,7 +2598,8 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) { * There is no name field for subzone and dname is void */ if (mtype == dns_ssumatchtype_subdomain && - cfg_obj_isvoid(dname)) { + cfg_obj_isvoid(dname)) + { str = "."; /* Use "." as a replacement. */ } else { str = cfg_obj_asstring(dname); @@ -2631,7 +2647,8 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) { case dns_ssumatchtype_tcpself: case dns_ssumatchtype_6to4self: if (tresult == ISC_R_SUCCESS && - !dns_name_equal(dns_rootname, name)) { + !dns_name_equal(dns_rootname, name)) + { cfg_obj_log(identity, logctx, ISC_LOG_ERROR, "name field not set to " "placeholder value '.'"); @@ -2682,7 +2699,8 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) { r.length = bracket - r.base; max = strtoul(bracket + 1, &end, 10); if (max > 0xffff || end[0] != /*(*/ ')' || - end[1] != 0) { + end[1] != 0) + { cfg_obj_log(typeobj, logctx, ISC_LOG_ERROR, "'%s' is not a valid count", @@ -2914,7 +2932,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, typestr = cfg_obj_asstring(obj); if (strcasecmp(typestr, "master") == 0 || - strcasecmp(typestr, "primary") == 0) { + strcasecmp(typestr, "primary") == 0) + { ztype = CFG_ZONE_PRIMARY; } else if (strcasecmp(typestr, "slave") == 0 || strcasecmp(typestr, "secondary") == 0) @@ -3054,7 +3073,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, isc_mem_free(mctx, tmp); } if (result == ISC_R_SUCCESS && - tresult != ISC_R_SUCCESS) { + tresult != ISC_R_SUCCESS) + { result = tresult; } } @@ -3126,7 +3146,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, const cfg_obj_t *kobj = cfg_tuple_get( cfg_listelt_value(element), "name"); if (strcmp(kaspname, cfg_obj_asstring(kobj)) == - 0) { + 0) + { has_dnssecpolicy = true; } } @@ -3514,7 +3535,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, obj = NULL; res1 = cfg_map_get(zoptions, "dnssec-dnskey-kskonly", &obj); if (res1 == ISC_R_SUCCESS && ztype == CFG_ZONE_SECONDARY && - !signing) { + !signing) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "dnssec-dnskey-kskonly: requires " "inline-signing when used in secondary " @@ -3531,7 +3553,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, obj = NULL; res1 = cfg_map_get(zoptions, "dnssec-loadkeys-interval", &obj); if (res1 == ISC_R_SUCCESS && ztype == CFG_ZONE_SECONDARY && - !signing) { + !signing) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "dnssec-loadkeys-interval: requires " "inline-signing when used in secondary " @@ -3542,7 +3565,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, obj = NULL; res1 = cfg_map_get(zoptions, "update-check-ksk", &obj); if (res1 == ISC_R_SUCCESS && ztype == CFG_ZONE_SECONDARY && - !signing) { + !signing) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "update-check-ksk: requires " "inline-signing when used in secondary " @@ -3577,7 +3601,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, if (obj != NULL && cfg_obj_isstring(obj)) { const char *str = cfg_obj_asstring(obj); for (i = 0; i < sizeof(dialups) / sizeof(dialups[0]); - i++) { + i++) + { if (strcasecmp(dialups[i].name, str) != 0) { continue; } @@ -3635,7 +3660,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, cfg_map_get(goptions, "forward", &obj); } if (obj == NULL || - strcasecmp(cfg_obj_asstring(obj), "first") == 0) { + strcasecmp(cfg_obj_asstring(obj), "first") == 0) + { cfg_obj_log(zconfig, logctx, ISC_LOG_WARNING, "inherited 'forward first;' for " "%s zone '%s' - did you want " @@ -3898,7 +3924,8 @@ bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) { result = isc_parse_uint16(&digestbits, algorithm + len + 1, 10); if (result == ISC_R_SUCCESS || result == ISC_R_RANGE) { if (result == ISC_R_RANGE || - digestbits > algorithms[i].size) { + digestbits > algorithms[i].size) + { cfg_obj_log(algobj, logctx, ISC_LOG_ERROR, "key '%s' digest-bits too large " "[%u..%u]", @@ -3917,7 +3944,8 @@ bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) { * Recommended minima for hmac algorithms. */ if ((digestbits < (algorithms[i].size / 2U) || - (digestbits < 80U))) { + (digestbits < 80U))) + { cfg_obj_log(algobj, logctx, ISC_LOG_WARNING, "key '%s' digest-bits too small " "[<%u]", @@ -4506,7 +4534,8 @@ check_trust_anchor(const cfg_obj_t *key, bool managed, unsigned int *flagsp, } if (result == ISC_R_SUCCESS && - dns_name_equal(keyname, dns_rootname)) { + dns_name_equal(keyname, dns_rootname)) + { /* * Flag any use of a root key, regardless of content. */ @@ -4562,7 +4591,8 @@ check_trust_anchor(const cfg_obj_t *key, bool managed, unsigned int *flagsp, result = ISC_R_FAILURE; } if (result == ISC_R_SUCCESS && - dns_name_equal(keyname, dns_rootname)) { + dns_name_equal(keyname, dns_rootname)) + { /* * Flag any use of a root key, regardless of content. */ @@ -4607,7 +4637,8 @@ record_static_keys(isc_symtab_t *symtab, isc_mem_t *mctx, name = dns_fixedname_initname(&fixed); for (elt = cfg_list_first(keylist); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { const char *initmethod; const cfg_obj_t *init = NULL; const cfg_obj_t *obj = cfg_listelt_value(elt); @@ -4670,7 +4701,8 @@ check_initializing_keys(isc_symtab_t *symtab, const cfg_obj_t *keylist, name = dns_fixedname_initname(&fixed); for (elt = cfg_list_first(keylist); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { const cfg_obj_t *obj = cfg_listelt_value(elt); const cfg_obj_t *init = NULL; const char *str; @@ -4726,7 +4758,8 @@ record_ds_keys(isc_symtab_t *symtab, isc_mem_t *mctx, name = dns_fixedname_initname(&fixed); for (elt = cfg_list_first(keylist); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { const char *initmethod; const cfg_obj_t *init = NULL; const cfg_obj_t *obj = cfg_listelt_value(elt); @@ -4794,7 +4827,8 @@ check_ta_conflicts(const cfg_obj_t *global_ta, const cfg_obj_t *view_ta, * and all the DS-style trust anchors. */ for (elt = cfg_list_first(global_ta); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { keylist = cfg_listelt_value(elt); tresult = record_static_keys(statictab, mctx, keylist, logctx, autovalidation); @@ -4809,7 +4843,8 @@ check_ta_conflicts(const cfg_obj_t *global_ta, const cfg_obj_t *view_ta, } for (elt = cfg_list_first(view_ta); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { keylist = cfg_listelt_value(elt); tresult = record_static_keys(statictab, mctx, keylist, logctx, autovalidation); @@ -4824,7 +4859,8 @@ check_ta_conflicts(const cfg_obj_t *global_ta, const cfg_obj_t *view_ta, } for (elt = cfg_list_first(global_tkeys); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { keylist = cfg_listelt_value(elt); tresult = record_static_keys(statictab, mctx, keylist, logctx, autovalidation); @@ -4834,7 +4870,8 @@ check_ta_conflicts(const cfg_obj_t *global_ta, const cfg_obj_t *view_ta, } for (elt = cfg_list_first(view_tkeys); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { keylist = cfg_listelt_value(elt); tresult = record_static_keys(statictab, mctx, keylist, logctx, autovalidation); @@ -4848,7 +4885,8 @@ check_ta_conflicts(const cfg_obj_t *global_ta, const cfg_obj_t *view_ta, * static keys and the trust-anchors configured with "initial-key". */ for (elt = cfg_list_first(global_ta); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { keylist = cfg_listelt_value(elt); tresult = check_initializing_keys(statictab, keylist, logctx); if (result == ISC_R_SUCCESS) { @@ -4857,7 +4895,8 @@ check_ta_conflicts(const cfg_obj_t *global_ta, const cfg_obj_t *view_ta, } for (elt = cfg_list_first(view_ta); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { keylist = cfg_listelt_value(elt); tresult = check_initializing_keys(statictab, keylist, logctx); if (result == ISC_R_SUCCESS) { @@ -5060,7 +5099,8 @@ check_catz(const cfg_obj_t *catz_obj, const char *viewname, isc_mem_t *mctx, if (primariesobj != NULL && cfg_obj_istuple(primariesobj)) { primariesobj = cfg_tuple_get(obj, "default-masters"); if (primariesobj != NULL && - cfg_obj_istuple(primariesobj)) { + cfg_obj_istuple(primariesobj)) + { cfg_obj_log(nameobj, logctx, ISC_LOG_ERROR, "catalog zone '%s'%s%s: " "'default-primaries' and " @@ -5303,7 +5343,8 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, result = ISC_R_FAILURE; } if (voptions != NULL && - check_nonzero(voptions, logctx) != ISC_R_SUCCESS) { + check_nonzero(voptions, logctx) != ISC_R_SUCCESS) + { result = ISC_R_FAILURE; } @@ -5355,7 +5396,8 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, * Global servers can refer to keys in views. */ if (check_servers(config, voptions, symtab, mctx, logctx) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { result = ISC_R_FAILURE; } @@ -5468,7 +5510,8 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, } if ((flags & ROOT_KSK_2010) != 0 && - (flags & ROOT_KSK_2017) == 0) { + (flags & ROOT_KSK_2017) == 0) + { cfg_obj_log(check_keys[i], logctx, ISC_LOG_WARNING, "initial-key entry for the root " @@ -5876,7 +5919,8 @@ bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, } if (bind9_check_parentalagentlists(config, logctx, mctx) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { result = ISC_R_FAILURE; } @@ -6039,14 +6083,16 @@ bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, const char *aclname; for (elt = cfg_list_first(acls); elt != NULL; - elt = cfg_list_next(elt)) { + elt = cfg_list_next(elt)) + { const cfg_obj_t *acl = cfg_listelt_value(elt); unsigned int line = cfg_obj_line(acl); unsigned int i; aclname = cfg_obj_asstring(cfg_tuple_get(acl, "name")); for (i = 0; i < sizeof(builtin) / sizeof(builtin[0]); - i++) { + i++) + { if (strcasecmp(aclname, builtin[i]) == 0) { { cfg_obj_log(acl, logctx, @@ -6062,7 +6108,8 @@ bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, } for (elt2 = cfg_list_next(elt); elt2 != NULL; - elt2 = cfg_list_next(elt2)) { + elt2 = cfg_list_next(elt2)) + { const cfg_obj_t *acl2 = cfg_listelt_value(elt2); const char *name; name = cfg_obj_asstring( diff --git a/lib/bind9/getaddresses.c b/lib/bind9/getaddresses.c index 6ce32d7a9be..5fa77704fe7 100644 --- a/lib/bind9/getaddresses.c +++ b/lib/bind9/getaddresses.c @@ -137,7 +137,8 @@ again: return (ISC_R_FAILURE); } for (tmpai = ai, i = 0; tmpai != NULL && i < addrsize; - tmpai = tmpai->ai_next) { + tmpai = tmpai->ai_next) + { if (tmpai->ai_family != AF_INET && tmpai->ai_family != AF_INET6) { continue; diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 01baa9e622d..c8c566bdeb6 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -1022,7 +1022,8 @@ shutdown_entries(dns_adb_t *adb) { */ next_entry = ISC_LIST_NEXT(entry, plink); if (isc_refcount_current(&entry->references) == 1 && - entry->expires == 0) { + entry->expires == 0) + { unlink_entry(entry); } entry_detach(&entry); @@ -1705,7 +1706,8 @@ get_entry(dns_adbentrybucket_t *ebucket, const isc_sockaddr_t *addr, /* Search the list, while cleaning up expired entries. */ for (entry = ISC_LIST_HEAD(ebucket->entries); entry != NULL; - entry = entry_next) { + entry = entry_next) + { entry_next = ISC_LIST_NEXT(entry, plink); /* Address entries expire after 30 minutes. */ @@ -1808,7 +1810,8 @@ copy_namehook_lists(dns_adb_t *adb, dns_adbfind_t *find, } if (!FIND_RETURNLAME(find) && - entry_is_lame(adb, entry, qname, qtype, now)) { + entry_is_lame(adb, entry, qname, qtype, now)) + { find->options |= DNS_ADBFIND_LAMEPRUNED; goto nextv4; } @@ -1843,7 +1846,8 @@ copy_namehook_lists(dns_adb_t *adb, dns_adbfind_t *find, } if (!FIND_RETURNLAME(find) && - entry_is_lame(adb, entry, qname, qtype, now)) { + entry_is_lame(adb, entry, qname, qtype, now)) + { find->options |= DNS_ADBFIND_LAMEPRUNED; goto nextv6; } @@ -2255,7 +2259,8 @@ dns__adb_detach(dns_adb_t **adbp, const char *func, const char *file, void dns_adb_shutdown(dns_adb_t *adb) { if (!atomic_compare_exchange_strong(&adb->exiting, &(bool){ false }, - true)) { + true)) + { return; } @@ -2969,7 +2974,8 @@ print_namehook_list(FILE *f, const char *legend, dns_adb_t *adb, dns_adbnamehook_t *nh = NULL; for (nh = ISC_LIST_HEAD(*list); nh != NULL; - nh = ISC_LIST_NEXT(nh, plink)) { + nh = ISC_LIST_NEXT(nh, plink)) + { if (debug) { fprintf(f, ";\tHook(%s) %p\n", legend, nh); } @@ -3251,7 +3257,8 @@ fetch_callback(isc_task_t *task, isc_event_t *ev) { fetch = name->fetch_a; name->fetch_a = NULL; } else if (NAME_FETCH_AAAA(name) && - (name->fetch_aaaa->fetch == dev->fetch)) { + (name->fetch_aaaa->fetch == dev->fetch)) + { address_type = DNS_ADBFIND_INET6; fetch = name->fetch_aaaa; name->fetch_aaaa = NULL; @@ -3491,7 +3498,8 @@ dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, LOCK(&ebucket->lock); li = ISC_LIST_HEAD(addr->entry->lameinfo); while (li != NULL && - (li->qtype != qtype || !dns_name_equal(qname, &li->qname))) { + (li->qtype != qtype || !dns_name_equal(qname, &li->qname))) + { li = ISC_LIST_NEXT(li, plink); } if (li != NULL) { @@ -3993,7 +4001,8 @@ dns_adb_flushnames(dns_adb_t *adb, const dns_name_t *name) { while (adbname != NULL) { nextname = ISC_LIST_NEXT(adbname, plink); if (!NAME_DEAD(adbname) && - dns_name_issubdomain(&adbname->name, name)) { + dns_name_issubdomain(&adbname->name, name)) + { expire_name(&adbname, DNS_EVENT_ADBCANCELED); } adbname = nextname; diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c index 6da55bee705..3ef1dfaeb6e 100644 --- a/lib/dns/badcache.c +++ b/lib/dns/badcache.c @@ -273,7 +273,8 @@ dns_badcache_add(dns_badcache_t *bc, const dns_name_t *name, count = atomic_fetch_add_relaxed(&bc->count, 1); if ((count > bc->size * 8) || - (count < bc->size * 2 && bc->size > bc->minsize)) { + (count < bc->size * 2 && bc->size > bc->minsize)) + { resize = true; } } else { diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 8c375084f53..2b8b64b5e25 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -367,28 +367,32 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) { for (size_t i = 0; i < eb->opts.masters.count; i++) { if ((ea->opts.masters.keys[i] == NULL) != - (eb->opts.masters.keys[i] == NULL)) { + (eb->opts.masters.keys[i] == NULL)) + { return (false); } if (ea->opts.masters.keys[i] == NULL) { continue; } if (!dns_name_equal(ea->opts.masters.keys[i], - eb->opts.masters.keys[i])) { + eb->opts.masters.keys[i])) + { return (false); } } for (size_t i = 0; i < eb->opts.masters.count; i++) { if ((ea->opts.masters.tlss[i] == NULL) != - (eb->opts.masters.tlss[i] == NULL)) { + (eb->opts.masters.tlss[i] == NULL)) + { return (false); } if (ea->opts.masters.tlss[i] == NULL) { continue; } if (!dns_name_equal(ea->opts.masters.tlss[i], - eb->opts.masters.tlss[i])) { + eb->opts.masters.tlss[i])) + { return (false); } } @@ -409,7 +413,8 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) { /* Repeat the above checks with allow_transfer */ if ((ea->opts.allow_transfer == NULL) != - (eb->opts.allow_transfer == NULL)) { + (eb->opts.allow_transfer == NULL)) + { return (false); } @@ -575,7 +580,8 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) { } } if (zt_find_result == ISC_R_SUCCESS || - zt_find_result == DNS_R_PARTIALMATCH) { + zt_find_result == DNS_R_PARTIALMATCH) + { dns_zone_detach(&zone); } @@ -584,7 +590,8 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) { (void **)&oentry); if (result != ISC_R_SUCCESS) { if (zt_find_result == ISC_R_SUCCESS && - parentcatz == target) { + parentcatz == target) + { /* * This means that the zone's unique label * has been changed, in that case we must @@ -1014,7 +1021,8 @@ dns_catz_catzs_detach(dns_catz_zones_t **catzsp) { isc_result_t result; isc_ht_iter_create(catzs->zones, &iter); for (result = isc_ht_iter_first(iter); - result == ISC_R_SUCCESS;) { + result == ISC_R_SUCCESS;) + { dns_catz_zone_t *zone = NULL; isc_ht_iter_current(iter, (void **)&zone); result = isc_ht_iter_delcurrent_next(iter); @@ -1047,7 +1055,8 @@ catz_opt_cmp(const dns_label_t *option, const char *opt) { size_t len = strlen(opt); if (option->length - 1 == len && - memcmp(opt, option->base + 1, len) == 0) { + memcmp(opt, option->base + 1, len) == 0) + { return (true); } else { return (false); @@ -1061,7 +1070,8 @@ catz_get_option(const dns_label_t *option) { } else if (catz_opt_cmp(option, "zones")) { return (CATZ_OPT_ZONES); } else if (catz_opt_cmp(option, "masters") || - catz_opt_cmp(option, "primaries")) { + catz_opt_cmp(option, "primaries")) + { return (CATZ_OPT_PRIMARIES); } else if (catz_opt_cmp(option, "allow-query")) { return (CATZ_OPT_ALLOW_QUERY); @@ -1428,7 +1438,8 @@ catz_process_primaries(dns_catz_zone_t *zone, dns_ipkeylist_t *ipkl, */ for (i = 0; i < ipkl->count; i++) { if (ipkl->labels[i] != NULL && - !dns_name_compare(name, ipkl->labels[i])) { + !dns_name_compare(name, ipkl->labels[i])) + { break; } } diff --git a/lib/dns/client.c b/lib/dns/client.c index df5888d517c..44a0471c826 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -744,7 +744,8 @@ client_resfind(resctx_t *rctx, dns_fetchevent_t *event) { tresult = dns_rdatasetiter_next(rdsiter); if (tresult == ISC_R_SUCCESS && - rctx->rdataset == NULL) { + rctx->rdataset == NULL) + { tresult = getrdataset(mctx, &rctx->rdataset); if (tresult != ISC_R_SUCCESS) { @@ -803,7 +804,8 @@ client_resfind(resctx_t *rctx, dns_fetchevent_t *event) { dns_rdataset_t *rdataset; while ((rdataset = ISC_LIST_HEAD(ansname->list)) != - NULL) { + NULL) + { ISC_LIST_UNLINK(ansname->list, rdataset, link); putrdataset(mctx, &rdataset); } diff --git a/lib/dns/compress.c b/lib/dns/compress.c index d0cba5d38a2..f176263dd99 100644 --- a/lib/dns/compress.c +++ b/lib/dns/compress.c @@ -264,7 +264,8 @@ insert(dns_compress_t *cctx, isc_buffer_t *buffer, const dns_name_t *name, * of the name and accumulating the hash in the same manner */ while (insert_label(cctx, buffer, name, label, hash, probe) && - label-- > 0) { + label-- > 0) + { unsigned int prefix_len = name->offsets[label]; uint8_t *suffix_ptr = name->ndata + prefix_len; hash = hash_label(hash, suffix_ptr, sensitive); @@ -353,7 +354,8 @@ dns_compress_rollback(dns_compress_t *cctx, unsigned int coff) { unsigned int prev = slot; unsigned int next = slot_index(cctx, prev, 1); while (cctx->set[next].coff != 0 && - probe_distance(cctx, next) != 0) { + probe_distance(cctx, next) != 0) + { cctx->set[prev] = cctx->set[next]; prev = next; next = slot_index(cctx, prev, 1); diff --git a/lib/dns/db.c b/lib/dns/db.c index c0b71599c2c..9c1472ada4b 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -1028,7 +1028,8 @@ dns_db_updatenotify_unregister(dns_db_t *db, dns_dbupdate_callback_t fn, listener = ISC_LIST_NEXT(listener, link)) { if ((listener->onupdate == fn) && - (listener->onupdate_arg == fn_arg)) { + (listener->onupdate_arg == fn_arg)) + { ISC_LIST_UNLINK(db->update_listeners, listener, link); isc_mem_put(db->mctx, listener, sizeof(dns_dbonupdatelistener_t)); diff --git a/lib/dns/diff.c b/lib/dns/diff.c index 1ec38b85e7e..6a2b130bc69 100644 --- a/lib/dns/diff.c +++ b/lib/dns/diff.c @@ -303,7 +303,8 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) { node = NULL; if (type != dns_rdatatype_nsec3 && - covers != dns_rdatatype_nsec3) { + covers != dns_rdatatype_nsec3) + { CHECK(dns_db_findnode(db, name, true, &node)); } else { CHECK(dns_db_findnsec3node(db, name, true, @@ -385,11 +386,13 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) { resign); } if (op == DNS_DIFFOP_ADD || - op == DNS_DIFFOP_ADDRESIGN) { + op == DNS_DIFFOP_ADDRESIGN) + { setownercase(&ardataset, name); } if (op == DNS_DIFFOP_DEL || - op == DNS_DIFFOP_DELRESIGN) { + op == DNS_DIFFOP_DELRESIGN) + { getownercase(&ardataset, name); } } else if (result == DNS_R_UNCHANGED) { @@ -415,11 +418,13 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) { namebuf, classbuf); } if (op == DNS_DIFFOP_ADD || - op == DNS_DIFFOP_ADDRESIGN) { + op == DNS_DIFFOP_ADDRESIGN) + { setownercase(&ardataset, name); } if (op == DNS_DIFFOP_DEL || - op == DNS_DIFFOP_DELRESIGN) { + op == DNS_DIFFOP_DELRESIGN) + { getownercase(&ardataset, name); } } else if (result == DNS_R_NXRRSET) { @@ -427,7 +432,8 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) { * OK. */ if (op == DNS_DIFFOP_DEL || - op == DNS_DIFFOP_DELRESIGN) { + op == DNS_DIFFOP_DELRESIGN) + { getownercase(&ardataset, name); } if (dns_rdataset_isassociated(&ardataset)) { @@ -519,7 +525,8 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc, "dns_diff_load: " "update with no effect"); } else if (result == ISC_R_SUCCESS || - result == DNS_R_NXRRSET) { + result == DNS_R_NXRRSET) + { /* * OK. */ @@ -546,7 +553,8 @@ dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare) { REQUIRE(DNS_DIFF_VALID(diff)); for (p = ISC_LIST_HEAD(diff->tuples); p != NULL; - p = ISC_LIST_NEXT(p, link)) { + p = ISC_LIST_NEXT(p, link)) + { length++; } if (length == 0) { @@ -604,7 +612,8 @@ dns_diff_print(dns_diff_t *diff, FILE *file) { mem = isc_mem_get(diff->mctx, size); for (t = ISC_LIST_HEAD(diff->tuples); t != NULL; - t = ISC_LIST_NEXT(t, link)) { + t = ISC_LIST_NEXT(t, link)) + { isc_buffer_t buf; isc_region_t r; diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 15062f523c5..246d0acdd86 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -375,7 +375,8 @@ entry_search(dns_qid_t *qid, const isc_sockaddr_t *dest, dns_messageid_t id, while (res != NULL) { if (res->id == id && isc_sockaddr_equal(dest, &res->peer) && - res->port == port) { + res->port == port) + { return (res); } res = ISC_LIST_NEXT(res, link); @@ -1224,7 +1225,8 @@ dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr, isc_sockaddr_eqaddr(localaddr, &sockname))) { if (atomic_load(&disp->tcpstate) == - DNS_DISPATCHSTATE_CONNECTED) { + DNS_DISPATCHSTATE_CONNECTED) + { /* We found connected dispatch */ disp_connected = disp; UNLOCK(&disp->lock); @@ -1554,7 +1556,8 @@ dispatch_getnext(dns_dispatch_t *disp, dns_dispentry_t *resp, int32_t timeout) { case isc_socktype_tcp: if (atomic_compare_exchange_strong(&disp->tcpreading, - &(bool){ false }, true)) { + &(bool){ false }, true)) + { dns_dispatch_attach(disp, &(dns_dispatch_t *){ NULL }); if (timeout > 0) { isc_nmhandle_settimeout(disp->handle, timeout); diff --git a/lib/dns/dnsrps.c b/lib/dns/dnsrps.c index b98c66ba355..3ca00825777 100644 --- a/lib/dns/dnsrps.c +++ b/lib/dns/dnsrps.c @@ -475,7 +475,8 @@ rpsdb_bind_soa(dns_rdataset_t *rdataset, rpsdb_t *rpsdb) { librpz_emsg_t emsg; if (!librpz->rsp_soa(&emsg, &ttl, NULL, NULL, &rpsdb->result, - rpsdb->rsp)) { + rpsdb->rsp)) + { librpz->log(LIBRPZ_LOG_ERROR, NULL, "%s", emsg.c); return (DNS_R_SERVFAIL); } @@ -712,7 +713,8 @@ rpsdb_rdataset_next(dns_rdataset_t *rdataset) { } RD_NEXT_RR(rdataset) = LIBRPZ_IDX_NULL; if (!librpz->rsp_soa(&emsg, NULL, &rr, NULL, &rpsdb->result, - rpsdb->rsp)) { + rpsdb->rsp)) + { librpz->log(LIBRPZ_LOG_ERROR, NULL, "%s", emsg.c); return (DNS_R_SERVFAIL); } diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index 9ab1640a57c..c6a4034962f 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -788,7 +788,8 @@ dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, dst_key_setttl(pubkey, rdataset.ttl); if (!is_zone_key(pubkey) || - (dst_key_flags(pubkey) & DNS_KEYTYPE_NOAUTH) != 0) { + (dst_key_flags(pubkey) & DNS_KEYTYPE_NOAUTH) != 0) + { goto next; } /* Corrupted .key file? */ @@ -821,7 +822,8 @@ dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, directory, mctx, &keys[count]); if (result == ISC_R_SUCCESS && dst_key_pubcompare(pubkey, keys[count], - false)) { + false)) + { dst_key_setflags(keys[count], flags); } dst_key_setflags(pubkey, flags); @@ -1450,7 +1452,8 @@ dns_dnssec_findmatchingkeys(const dns_name_t *origin, const char *directory, * Did we correctly terminate? */ if (i != len + 1 + 1 + 3 || i >= dir.entry.length || - dir.entry.name[i] != '+') { + dir.entry.name[i] != '+') + { continue; } @@ -1549,7 +1552,8 @@ addkey(dns_dnsseckeylist_t *keylist, dst_key_t **newkey, bool savekeys, /* Skip duplicates */ for (key = ISC_LIST_HEAD(*keylist); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { if (dst_key_id(key->key) == dst_key_id(*newkey) && dst_key_alg(key->key) == dst_key_alg(*newkey) && dns_name_equal(dst_key_name(key->key), @@ -1603,7 +1607,8 @@ mark_active_keys(dns_dnsseckeylist_t *keylist, dns_rdataset_t *rrsigs) { dns_rdataset_init(&sigs); dns_rdataset_clone(rrsigs, &sigs); for (key = ISC_LIST_HEAD(*keylist); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { uint16_t keyid, sigid; dns_secalg_t keyalg, sigalg; keyid = dst_key_id(key->key); @@ -1675,7 +1680,8 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, const char *directory, dst_key_setttl(dnskey, keys.ttl); if (!is_zone_key(dnskey) || - (dst_key_flags(dnskey) & DNS_KEYTYPE_NOAUTH) != 0) { + (dst_key_flags(dnskey) & DNS_KEYTYPE_NOAUTH) != 0) + { goto skip; } @@ -1965,7 +1971,8 @@ dns_dnssec_syncupdate(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *rmkeys, dns_dnsseckey_t *key; for (key = ISC_LIST_HEAD(*keys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { dns_rdata_t cds_sha1 = DNS_RDATA_INIT; dns_rdata_t cds_sha256 = DNS_RDATA_INIT; dns_rdata_t cdnskeyrdata = DNS_RDATA_INIT; @@ -2001,7 +2008,8 @@ dns_dnssec_syncupdate(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *rmkeys, dst_key_format(key->key, keystr, sizeof(keystr)); if (!dns_rdataset_isassociated(cdnskey) || - !exists(cdnskey, &cdnskeyrdata)) { + !exists(cdnskey, &cdnskeyrdata)) + { isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO, @@ -2012,7 +2020,8 @@ dns_dnssec_syncupdate(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *rmkeys, } /* Only publish SHA-256 (SHA-1 is deprecated) */ if (!dns_rdataset_isassociated(cds) || - !exists(cds, &cds_sha256)) { + !exists(cds, &cds_sha256)) + { isc_log_write( dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO, @@ -2072,7 +2081,8 @@ dns_dnssec_syncupdate(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *rmkeys, } if (!dns_rdataset_isassociated(cds) && - !dns_rdataset_isassociated(cdnskey)) { + !dns_rdataset_isassociated(cdnskey)) + { return (ISC_R_SUCCESS); } @@ -2080,7 +2090,8 @@ dns_dnssec_syncupdate(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *rmkeys, * Unconditionally remove CDS/DNSKEY records for removed keys. */ for (key = ISC_LIST_HEAD(*rmkeys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { dns_rdata_t cds_sha1 = DNS_RDATA_INIT; dns_rdata_t cds_sha256 = DNS_RDATA_INIT; dns_rdata_t cdnskeyrdata = DNS_RDATA_INIT; @@ -2165,7 +2176,8 @@ dns_dnssec_syncdelete(dns_rdataset_t *cds, dns_rdataset_t *cdnskey, if (expect_cds_delete) { if (!dns_rdataset_isassociated(cds) || - !exists(cds, &cds_delete)) { + !exists(cds, &cds_delete)) + { isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO, "CDS (DELETE) for zone %s is now " @@ -2188,7 +2200,8 @@ dns_dnssec_syncdelete(dns_rdataset_t *cds, dns_rdataset_t *cdnskey, if (expect_cdnskey_delete) { if (!dns_rdataset_isassociated(cdnskey) || - !exists(cdnskey, &cdnskey_delete)) { + !exists(cdnskey, &cdnskey_delete)) + { isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO, "CDNSKEY (DELETE) for zone %s is now " @@ -2199,7 +2212,8 @@ dns_dnssec_syncdelete(dns_rdataset_t *cds, dns_rdataset_t *cdnskey, } } else { if (dns_rdataset_isassociated(cdnskey) && - exists(cdnskey, &cdnskey_delete)) { + exists(cdnskey, &cdnskey_delete)) + { isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO, "CDNSKEY (DELETE) for zone %s is now " @@ -2241,7 +2255,8 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, * use their TTL for all subsequent published keys. */ for (key = ISC_LIST_HEAD(*keys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { if (key->source == dns_keysource_user && (key->hint_publish || key->force_publish)) { @@ -2262,10 +2277,12 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, dns_ttl_t shortest = 0; for (key = ISC_LIST_HEAD(*newkeys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { dns_ttl_t thisttl = dst_key_getttl(key->key); if (thisttl != 0 && - (shortest == 0 || thisttl < shortest)) { + (shortest == 0 || thisttl < shortest)) + { shortest = thisttl; } } @@ -2413,7 +2430,8 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, continue; } else { if (!key2->is_active && - (key1->hint_sign || key1->force_sign)) { + (key1->hint_sign || key1->force_sign)) + { key2->first_sign = true; isc_log_write( dns_lctx, DNS_LOGCATEGORY_DNSSEC, @@ -2422,7 +2440,8 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, key1->ksk ? (key1->zsk ? "CSK" : "KSK") : "ZSK"); } else if (key2->is_active && !key1->hint_sign && - !key1->force_sign) { + !key1->force_sign) + { isc_log_write( dns_lctx, DNS_LOGCATEGORY_DNSSEC, DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO, diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index 14a1c7e4a8c..1016978edb2 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -1225,7 +1225,8 @@ comparekeys(const dst_key_t *key1, const dst_key_t *key2, return (false); } if (key1->key_id != key2->key_rid && - key1->key_rid != key2->key_id) { + key1->key_rid != key2->key_id) + { return (false); } } @@ -2235,7 +2236,8 @@ buildfilename(dns_name_t *name, dns_keytag_t id, unsigned int alg, } isc_buffer_putstr(out, directory); if (strlen(directory) > 0U && - directory[strlen(directory) - 1] != '/') { + directory[strlen(directory) - 1] != '/') + { isc_buffer_putstr(out, "/"); } } diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c index 590591b9a02..901b890d476 100644 --- a/lib/dns/dst_parse.c +++ b/lib/dns/dst_parse.c @@ -122,7 +122,8 @@ find_value(const char *s, const unsigned int alg) { for (i = 0; map[i].tag != NULL; i++) { if (strcasecmp(s, map[i].tag) == 0 && - (TAG_ALG(map[i].value) == alg)) { + (TAG_ALG(map[i].value) == alg)) + { return (map[i].value); } } diff --git a/lib/dns/ecs.c b/lib/dns/ecs.c index 8dbf720f64e..676c740af57 100644 --- a/lib/dns/ecs.c +++ b/lib/dns/ecs.c @@ -45,7 +45,8 @@ dns_ecs_equals(const dns_ecs_t *ecs1, const dns_ecs_t *ecs2) { REQUIRE(ecs1 != NULL && ecs2 != NULL); if (ecs1->source != ecs2->source || - ecs1->addr.family != ecs2->addr.family) { + ecs1->addr.family != ecs2->addr.family) + { return (false); } diff --git a/lib/dns/forward.c b/lib/dns/forward.c index 9fe4d262aeb..270dbd41edb 100644 --- a/lib/dns/forward.c +++ b/lib/dns/forward.c @@ -80,7 +80,8 @@ dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, const dns_name_t *name, ISC_LIST_INIT(forwarders->fwdrs); for (fwd = ISC_LIST_HEAD(*fwdrs); fwd != NULL; - fwd = ISC_LIST_NEXT(fwd, link)) { + fwd = ISC_LIST_NEXT(fwd, link)) + { nfwd = isc_mem_get(fwdtable->mctx, sizeof(dns_forwarder_t)); *nfwd = *fwd; ISC_LINK_INIT(nfwd, link); @@ -122,7 +123,8 @@ dns_fwdtable_add(dns_fwdtable_t *fwdtable, const dns_name_t *name, ISC_LIST_INIT(forwarders->fwdrs); for (sa = ISC_LIST_HEAD(*addrs); sa != NULL; - sa = ISC_LIST_NEXT(sa, link)) { + sa = ISC_LIST_NEXT(sa, link)) + { fwd = isc_mem_get(fwdtable->mctx, sizeof(dns_forwarder_t)); fwd->addr = *sa; fwd->dscp = -1; diff --git a/lib/dns/gen.c b/lib/dns/gen.c index 5003fc02ff0..2e27fc53f49 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -137,7 +137,7 @@ static struct cc { struct cc *next; uint16_t rdclass; char classbuf[TYPECLASSBUF]; -} * classes; +} *classes; static struct tt { struct tt *next; @@ -146,7 +146,7 @@ static struct tt { char classbuf[TYPECLASSBUF]; char typebuf[TYPECLASSBUF]; char dirbuf[PATH_MAX - 30]; -} * types; +} *types; static struct ttnam { char typebuf[TYPECLASSBUF]; diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c index 6111d21e3c2..4a753fd60d8 100644 --- a/lib/dns/hmac_link.c +++ b/lib/dns/hmac_link.c @@ -338,7 +338,8 @@ hmac_fromdns(const isc_md_type_t *type, dst_key_t *key, isc_buffer_t *data) { /* Hash the key if the key is longer then chosen MD block size */ if (r.length > (unsigned int)isc_md_type_get_block_size(type)) { if (isc_md(type, r.base, r.length, hkey->key, &keylen) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { isc_mem_put(key->mctx, hkey, sizeof(dst_hmac_key_t)); return (DST_R_OPENSSLFAILURE); } diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 54467dd18f7..f36db188e32 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -865,7 +865,8 @@ maybe_fixup_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr, uint32_t serial, * transaction headers in a version 1 journal. */ if ((xhdr->serial0 != serial || - isc_serial_le(xhdr->serial1, xhdr->serial0))) { + isc_serial_le(xhdr->serial1, xhdr->serial0))) + { if (j->xhdr_version == XHDR_VERSION1 && xhdr->serial1 == serial) { isc_log_write( @@ -877,7 +878,8 @@ maybe_fixup_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr, uint32_t serial, CHECK(journal_read_xhdr(j, xhdr)); j->recovered = true; } else if (j->xhdr_version == XHDR_VERSION2 && - xhdr->count == serial) { + xhdr->count == serial) + { isc_log_write( JOURNAL_COMMON_LOGARGS, ISC_LOG_DEBUG(3), "%s: XHDR_VERSION2 -> XHDR_VERSION1 at %u", @@ -972,7 +974,8 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) { * Check serial number consistency. */ if (xhdr.serial0 != pos->serial || - isc_serial_le(xhdr.serial1, xhdr.serial0)) { + isc_serial_le(xhdr.serial1, xhdr.serial0)) + { isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, "%s: journal file corrupt: " "expected serial %u, got %u", @@ -1202,7 +1205,8 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) { * keep track of SOA serial numbers. */ for (t = ISC_LIST_HEAD(diff->tuples); t != NULL; - t = ISC_LIST_NEXT(t, link)) { + t = ISC_LIST_NEXT(t, link)) + { if (t->rdata.type == dns_rdatatype_soa) { if (j->x.n_soa < 2) { j->x.pos[j->x.n_soa].serial = @@ -1232,7 +1236,8 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) { * Pass 2. Write RRs to buffer. */ for (t = ISC_LIST_HEAD(diff->tuples); t != NULL; - t = ISC_LIST_NEXT(t, link)) { + t = ISC_LIST_NEXT(t, link)) + { /* * Write the RR header. */ @@ -1344,7 +1349,8 @@ dns_journal_commit(dns_journal_t *j) { */ if (!JOURNAL_EMPTY(&j->header)) { while (!DNS_SERIAL_GT(j->x.pos[1].serial, - j->header.begin.serial)) { + j->header.begin.serial)) + { CHECK(journal_next(j, &j->header.begin)); } index_invalidate(j, j->x.pos[1].serial); @@ -1888,7 +1894,8 @@ dns_journal_iter_init(dns_journal_t *j, uint32_t begin_serial, * Check that xhdr is consistent. */ if (xhdr.serial0 != pos.serial || - isc_serial_le(xhdr.serial1, xhdr.serial0)) { + isc_serial_le(xhdr.serial1, xhdr.serial0)) + { CHECK(ISC_R_UNEXPECTED); } @@ -2640,7 +2647,8 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, * xhdr format may be wrong. */ if (rewrite && (result != ISC_R_SUCCESS || - !check_delta(buf, size))) { + !check_delta(buf, size))) + { if (j1->xhdr_version == XHDR_VERSION2) { /* XHDR_VERSION2 -> XHDR_VERSION1 */ j1->xhdr_version = XHDR_VERSION1; @@ -2694,7 +2702,8 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, * Check that xhdr is consistent. */ if (xhdr.serial0 != serial || - isc_serial_le(xhdr.serial1, xhdr.serial0)) { + isc_serial_le(xhdr.serial1, xhdr.serial0)) + { CHECK(ISC_R_UNEXPECTED); } @@ -2783,7 +2792,8 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, if (errno == EEXIST && !is_backup) { result = isc_file_remove(backup); if (result != ISC_R_SUCCESS && - result != ISC_R_FILENOTFOUND) { + result != ISC_R_FILENOTFOUND) + { goto failure; } if (rename(filename, backup) == -1) { diff --git a/lib/dns/key.c b/lib/dns/key.c index e4afa88ddb8..7d4f378e695 100644 --- a/lib/dns/key.c +++ b/lib/dns/key.c @@ -134,7 +134,8 @@ dst_key_iszonekey(const dst_key_t *key) { return (false); } if (key->key_proto != DNS_KEYPROTO_DNSSEC && - key->key_proto != DNS_KEYPROTO_ANY) { + key->key_proto != DNS_KEYPROTO_ANY) + { return (false); } return (true); @@ -151,7 +152,8 @@ dst_key_isnullkey(const dst_key_t *key) { return (false); } if (key->key_proto != DNS_KEYPROTO_DNSSEC && - key->key_proto != DNS_KEYPROTO_ANY) { + key->key_proto != DNS_KEYPROTO_ANY) + { return (false); } return (true); diff --git a/lib/dns/keymgr.c b/lib/dns/keymgr.c index 4a3f3fe7457..d4b76bb19bb 100644 --- a/lib/dns/keymgr.c +++ b/lib/dns/keymgr.c @@ -329,7 +329,8 @@ keymgr_key_retire(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) { if (dst_key_getstate(key->key, DST_KEY_KRRSIG, &s) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { dst_key_setstate(key->key, DST_KEY_KRRSIG, OMNIPRESENT); dst_key_settime(key->key, DST_TIME_KRRSIG, now); } @@ -342,7 +343,8 @@ keymgr_key_retire(dns_dnsseckey_t *key, dns_kasp_t *kasp, isc_stdtime_t now) { ret = dst_key_getbool(key->key, DST_BOOL_ZSK, &zsk); if (ret == ISC_R_SUCCESS && zsk) { if (dst_key_getstate(key->key, DST_KEY_ZRRSIG, &s) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { dst_key_setstate(key->key, DST_KEY_ZRRSIG, OMNIPRESENT); dst_key_settime(key->key, DST_TIME_ZRRSIG, now); } @@ -550,7 +552,8 @@ keymgr_key_match_state(dst_key_t *key, dst_key_t *subject, int type, continue; } if (next_state != NA && i == type && - dst_key_id(key) == dst_key_id(subject)) { + dst_key_id(key) == dst_key_id(subject)) + { /* Check next state rather than current state. */ state = next_state; } else if (dst_key_getstate(key, i, &state) != ISC_R_SUCCESS) { @@ -708,12 +711,14 @@ keymgr_key_exists_with_state(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, dkey = ISC_LIST_NEXT(dkey, link)) { if (match_algorithms && - (dst_key_alg(dkey->key) != dst_key_alg(key->key))) { + (dst_key_alg(dkey->key) != dst_key_alg(key->key))) + { continue; } if (!keymgr_key_match_state(dkey->key, key->key, type, - next_state, states)) { + next_state, states)) + { continue; } @@ -734,7 +739,8 @@ keymgr_key_exists_with_state(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, } if (!keymgr_key_match_state(skey->key, key->key, type, - next_state, states2)) { + next_state, states2)) + { continue; } @@ -793,12 +799,14 @@ keymgr_ds_hidden_or_chained(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, dkey = ISC_LIST_NEXT(dkey, link)) { if (match_algorithms && - (dst_key_alg(dkey->key) != dst_key_alg(key->key))) { + (dst_key_alg(dkey->key) != dst_key_alg(key->key))) + { continue; } if (keymgr_key_match_state(dkey->key, key->key, type, - next_state, ds_hidden)) { + next_state, ds_hidden)) + { /* This key has its DS hidden. */ continue; } @@ -860,7 +868,8 @@ keymgr_dnskey_hidden_or_chained(dns_dnsseckeylist_t *keyring, dkey = ISC_LIST_NEXT(dkey, link)) { if (match_algorithms && - (dst_key_alg(dkey->key) != dst_key_alg(key->key))) { + (dst_key_alg(dkey->key) != dst_key_alg(key->key))) + { continue; } @@ -1445,7 +1454,8 @@ transition: /* Is the transition allowed according to policy? */ if (!keymgr_policy_approval(keyring, dkey, i, - next_state)) { + next_state)) + { /* No, please respect rollover methods. */ isc_log_write( dns_lctx, DNS_LOGCATEGORY_DNSSEC, @@ -1619,7 +1629,8 @@ keymgr_key_init(dns_dnsseckey_t *key, dns_kasp_t *kasp, isc_stdtime_t now, /* Set goal if not already set. */ if (dst_key_getstate(key->key, DST_KEY_GOAL, &goal_state) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { dst_key_setstate(key->key, DST_KEY_GOAL, goal_state); } @@ -2037,7 +2048,8 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, /* Check purge-keys interval. */ if (keymgr_key_may_be_purged(dkey->key, - dns_kasp_purgekeys(kasp), now)) { + dns_kasp_purgekeys(kasp), now)) + { dst_key_format(dkey->key, keystr, sizeof(keystr)); isc_log_write(dns_lctx, DNS_LOGCATEGORY_DNSSEC, DNS_LOGMODULE_DNSSEC, ISC_LOG_INFO, @@ -2084,7 +2096,8 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, /* Initialize lifetime if not set. */ uint32_t l; if (dst_key_getnum(dkey->key, DST_NUM_LIFETIME, - &l) != ISC_R_SUCCESS) { + &l) != ISC_R_SUCCESS) + { dst_key_setnum(dkey->key, DST_NUM_LIFETIME, lifetime); @@ -2118,7 +2131,8 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, * or desires to be active. */ if (dst_key_goal(dkey->key) == OMNIPRESENT || - dst_key_is_active(dkey->key, now)) { + dst_key_is_active(dkey->key, now)) + { active_key = dkey; } } @@ -2136,7 +2150,8 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, dnskey = ISC_LIST_NEXT(dnskey, link)) { if (keymgr_dnsseckey_kaspkey_match(dnskey, - kkey)) { + kkey)) + { /* Found a match. */ dst_key_format(dnskey->key, keystr, sizeof(keystr)); diff --git a/lib/dns/master.c b/lib/dns/master.c index b28ff98e82f..23d55d28000 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -359,7 +359,8 @@ gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token, bool eol, } if (eol != true) { if (token->type == isc_tokentype_eol || - token->type == isc_tokentype_eof) { + token->type == isc_tokentype_eof) + { { unsigned long int line; const char *what; @@ -841,7 +842,8 @@ generate(dns_loadctx_t *lctx, char *range, char *lhs, char *gtype, char *rhs, } if (dns_master_isprimary(lctx) && - !dns_name_issubdomain(owner, lctx->top)) { + !dns_name_issubdomain(owner, lctx->top)) + { char namebuf[DNS_NAME_FORMATSIZE]; dns_name_format(owner, namebuf, sizeof(namebuf)); /* @@ -1159,7 +1161,8 @@ load_text(dns_loadctx_t *lctx) { EXPECTEOL; continue; } else if (strcasecmp(DNS_AS_STR(token), "$INCLUDE") == - 0) { + 0) + { COMMITALL; if ((lctx->options & DNS_MASTER_NOINCLUDE) != 0) { @@ -1193,7 +1196,8 @@ load_text(dns_loadctx_t *lctx) { GETTOKEN(lctx->lex, 0, &token, true); if (token.type == isc_tokentype_eol || - token.type == isc_tokentype_eof) { + token.type == isc_tokentype_eof) + { if (token.type == isc_tokentype_eof) { WARNUNEXPECTEDEOF(lctx->lex); } @@ -1259,7 +1263,8 @@ load_text(dns_loadctx_t *lctx) { EXPECTEOL; continue; } else if (strcasecmp(DNS_AS_STR(token), "$GENERATE") == - 0) { + 0) + { /* * Lazy cleanup. */ @@ -1296,7 +1301,8 @@ load_text(dns_loadctx_t *lctx) { /* TTL? */ if (dns_ttl_fromtext(&token.value.as_textregion, &lctx->ttl) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { limit_ttl(callbacks, source, line, &lctx->ttl); lctx->ttl_known = true; @@ -1319,7 +1325,8 @@ load_text(dns_loadctx_t *lctx) { false); rhs = isc_mem_strdup(mctx, DNS_AS_STR(token)); if (!lctx->ttl_known && - !lctx->default_ttl_known) { + !lctx->default_ttl_known) + { (*callbacks->error)(callbacks, "%s: %s:%lu: no " "TTL specified", @@ -1333,7 +1340,8 @@ load_text(dns_loadctx_t *lctx) { goto insist_and_cleanup; } } else if (!explicit_ttl && - lctx->default_ttl_known) { + lctx->default_ttl_known) + { lctx->ttl = lctx->default_ttl; } /* @@ -1437,7 +1445,8 @@ load_text(dns_loadctx_t *lctx) { * state. Linked lists are undone by commit(). */ if (ictx->glue != NULL && - !dns_name_caseequal(ictx->glue, new_name)) { + !dns_name_caseequal(ictx->glue, new_name)) + { result = commit(callbacks, lctx, &glue_list, ictx->glue, source, ictx->glue_line); @@ -1468,7 +1477,8 @@ load_text(dns_loadctx_t *lctx) { !dns_name_caseequal(ictx->current, new_name))) { if (current_has_delegation && - is_glue(¤t_list, new_name)) { + is_glue(¤t_list, new_name)) + { rdcount_save = rdcount; rdlcount_save = rdlcount; target_save = target; @@ -1504,13 +1514,15 @@ load_text(dns_loadctx_t *lctx) { * Check for internal wildcards. */ if ((lctx->options & - DNS_MASTER_CHECKWILDCARD) != 0) { + DNS_MASTER_CHECKWILDCARD) != 0) + { check_wildcard(ictx, source, line, callbacks); } } if (dns_master_isprimary(lctx) && - !dns_name_issubdomain(new_name, lctx->top)) { + !dns_name_issubdomain(new_name, lctx->top)) + { char namebuf[DNS_NAME_FORMATSIZE]; dns_name_format(new_name, namebuf, sizeof(namebuf)); @@ -1793,7 +1805,8 @@ load_text(dns_loadctx_t *lctx) { result = DNS_R_BADOWNERNAME; desc = isc_result_totext(result); if (CHECKNAMESFAIL(lctx->options) || - type == dns_rdatatype_nsec3) { + type == dns_rdatatype_nsec3) + { (*callbacks->error)( callbacks, "%s:%lu: %s: %s", source, line, namebuf, desc); @@ -2045,7 +2058,8 @@ load_text(dns_loadctx_t *lctx) { } if ((lctx->options & DNS_MASTER_CHECKTTL) != 0 && - lctx->ttl > lctx->maxttl) { + lctx->ttl > lctx->maxttl) + { (callbacks->error)(callbacks, "dns_master_load: %s:%lu: " "TTL %d exceeds configured " @@ -2461,7 +2475,8 @@ load_raw(dns_loadctx_t *lctx) { } if ((lctx->options & DNS_MASTER_CHECKTTL) != 0 && - rdatalist.ttl > lctx->maxttl) { + rdatalist.ttl > lctx->maxttl) + { (callbacks->error)(callbacks, "dns_master_load: " "TTL %d exceeds configured " @@ -2492,7 +2507,8 @@ load_raw(dns_loadctx_t *lctx) { dns_rdata_init(&rdata[i]); if (sequential_read && - isc_buffer_availablelength(&target) < MINTSIZ) { + isc_buffer_availablelength(&target) < MINTSIZ) + { unsigned int j; INSIST(i > 0); /* detect an infinite loop */ diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index d46fd6e7585..2604772d210 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -665,7 +665,8 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, INDENT_TO(class_column); class_start = target->used; if ((ctx->style.flags & DNS_STYLEFLAG_UNKNOWNFORMAT) != - 0) { + 0) + { result = dns_rdataclass_tounknowntext( rdataset->rdclass, target); } else { @@ -698,7 +699,8 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, #define KEYDATA "KEYDATA" if ((ctx->style.flags & DNS_STYLEFLAG_KEYDATA) != 0) { if (isc_buffer_availablelength(target) < - (sizeof(KEYDATA) - 1)) { + (sizeof(KEYDATA) - 1)) + { return (ISC_R_NOSPACE); } isc_buffer_putstr(target, KEYDATA); @@ -707,7 +709,8 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, FALLTHROUGH; default: if ((ctx->style.flags & DNS_STYLEFLAG_UNKNOWNFORMAT) != - 0) { + 0) + { result = dns_rdatatype_tounknowntext(type, target); } else { @@ -933,7 +936,8 @@ dump_rdataset(isc_mem_t *mctx, const dns_name_t *name, dns_rdataset_t *rdataset, if ((ctx->style.flags & DNS_STYLEFLAG_TTL) != 0) { if (!ctx->current_ttl_valid || - ctx->current_ttl != rdataset->ttl) { + ctx->current_ttl != rdataset->ttl) + { if ((ctx->style.flags & DNS_STYLEFLAG_COMMENT) != 0) { isc_buffer_clear(buffer); result = dns_ttl_totext(rdataset->ttl, true, @@ -1078,7 +1082,8 @@ again: dns_rdataset_t *rds = sorted[i]; if (ANCIENT(rds) && - (ctx->style.flags & DNS_STYLEFLAG_EXPIRED) == 0) { + (ctx->style.flags & DNS_STYLEFLAG_EXPIRED) == 0) + { /* Omit expired entries */ dns_rdataset_disassociate(rds); continue; @@ -1223,7 +1228,8 @@ restart: * continue?). */ if (isc_buffer_availablelength(buffer) < - sizeof(dlen) + r.length) { + sizeof(dlen) + r.length) + { int newlength; void *newmem; @@ -1691,7 +1697,8 @@ dumptostream(dns_dumpctx_t *dctx) { result = dns_dbiterator_origin(dctx->dbiter, origin); RUNTIME_CHECK(result == ISC_R_SUCCESS); if ((dctx->tctx.style.flags & DNS_STYLEFLAG_REL_DATA) != - 0) { + 0) + { dctx->tctx.origin = origin; } dctx->tctx.neworigin = origin; diff --git a/lib/dns/message.c b/lib/dns/message.c index ca72b6580f2..d2be3c227c2 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -825,7 +825,8 @@ dns_message_find(const dns_name_t *name, dns_rdataclass_t rdclass, curr = ISC_LIST_PREV(curr, link)) { if (curr->rdclass == rdclass && curr->type == type && - curr->covers == covers) { + curr->covers == covers) + { if (rdataset != NULL) { *rdataset = curr; } @@ -1322,7 +1323,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t dctx, tkeysection = DNS_SECTION_ANSWER; } if (sectionid != tkeysection && - sectionid != DNS_SECTION_ANSWER) { + sectionid != DNS_SECTION_ANSWER) + { DO_ERROR(DNS_R_FORMERR); } } @@ -1350,7 +1352,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t dctx, goto cleanup; } if (msg->opcode == dns_opcode_update && - update(sectionid, rdclass)) { + update(sectionid, rdclass)) + { if (rdatalen != 0) { result = DNS_R_FORMERR; goto cleanup; @@ -1388,7 +1391,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t dctx, DO_ERROR(DNS_R_FORMERR); } } else if (rdtype == dns_rdatatype_sig /* SIG(0) */ && - rdata->flags == 0) { + rdata->flags == 0) + { covers = dns_rdata_covers(rdata); if (covers == 0) { if (sectionid != DNS_SECTION_ADDITIONAL || @@ -1403,7 +1407,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t dctx, } } else { if (msg->rdclass != dns_rdataclass_any && - msg->rdclass != rdclass) { + msg->rdclass != rdclass) + { DO_ERROR(DNS_R_FORMERR); } } @@ -1427,7 +1432,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t dctx, * to the end of the message. */ if (preserve_order || msg->opcode == dns_opcode_update || - skip_name_search) { + skip_name_search) + { if (!isedns && !istsig && !issigzero) { ISC_LIST_APPEND(*section, name, link); free_name = false; @@ -1458,7 +1464,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t dctx, * Skip this stage if in update mode or this is a meta-type. */ if (preserve_order || msg->opcode == dns_opcode_update || - skip_type_search) { + skip_type_search) + { result = ISC_R_NOTFOUND; } else { /* @@ -2041,7 +2048,8 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, next_rdataset = ISC_LIST_NEXT(rdataset, link); if ((rdataset->attributes & - DNS_RDATASETATTR_RENDERED) != 0) { + DNS_RDATASETATTR_RENDERED) != 0) + { goto next; } @@ -2249,7 +2257,8 @@ dns_message_renderend(dns_message_t *msg) { /* Check PAD */ if ((cp[-4] != 0) || (cp[-3] != DNS_OPT_PAD) || (cp[-2] != 0) || - (cp[-1] != 0)) { + (cp[-1] != 0)) + { return (ISC_R_UNEXPECTED); } @@ -3043,7 +3052,8 @@ dns_message_signer(dns_message_t *msg, dns_name_t *signer) { { result = ISC_R_SUCCESS; } else if ((!msg->verified_sig) || - (msg->tsigstatus != dns_rcode_noerror)) { + (msg->tsigstatus != dns_rcode_noerror)) + { result = DNS_R_TSIGVERIFYFAILURE; } else { INSIST(tsig.error != dns_rcode_noerror); @@ -3191,7 +3201,8 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) { result = dns_rdataset_first(&keyset); INSIST(result == ISC_R_SUCCESS); for (; result == ISC_R_SUCCESS; - result = dns_rdataset_next(&keyset)) { + result = dns_rdataset_next(&keyset)) + { dst_key_t *key = NULL; dns_rdata_reset(&rdata); @@ -3299,13 +3310,15 @@ dns_message_sectiontotext(dns_message_t *msg, dns_section_t section, rdataset = ISC_LIST_NEXT(rdataset, link)) { if (section == DNS_SECTION_ANSWER && - rdataset->type == dns_rdatatype_soa) { + rdataset->type == dns_rdatatype_soa) + { if ((flags & DNS_MESSAGETEXTFLAG_OMITSOA) != 0) { continue; } if (seensoa && - (flags & DNS_MESSAGETEXTFLAG_ONESOA) != 0) { + (flags & DNS_MESSAGETEXTFLAG_ONESOA) != 0) + { continue; } seensoa = true; @@ -3764,7 +3777,8 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section, } for (i = 0; i < optlen; i++) { if (isprint(optdata[i]) || - (utf8ok && optdata[i] > 127)) { + (utf8ok && optdata[i] > 127)) + { isc_buffer_putmem( target, &optdata[i], 1); } else { @@ -4120,7 +4134,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, } for (i = 0; i < optlen; i++) { if (isprint(optdata[i]) || - (utf8ok && optdata[i] > 127)) { + (utf8ok && optdata[i] > 127)) + { isc_buffer_putmem( target, &optdata[i], 1); } else { @@ -4578,7 +4593,8 @@ dns_message_buildopt(dns_message_t *message, dns_rdataset_t **rdatasetp, for (i = 0; i < count; i++) { if (ednsopts[i].code == DNS_OPT_PAD && - ednsopts[i].length == 0U && !seenpad) { + ednsopts[i].length == 0U && !seenpad) + { seenpad = true; continue; } @@ -4685,7 +4701,8 @@ message_authority_soa_min(dns_message_t *msg, dns_ttl_t *pttl) { isc_result_t tresult; if ((rdataset->attributes & - DNS_RDATASETATTR_RENDERED) == 0) { + DNS_RDATASETATTR_RENDERED) == 0) + { continue; } diff --git a/lib/dns/name.c b/lib/dns/name.c index 5ce59698157..0712191cb50 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -649,7 +649,8 @@ dns_name_issubdomain(const dns_name_t *name1, const dns_name_t *name2) { namereln = dns_name_fullcompare(name1, name2, &order, &nlabels); if (namereln == dns_namereln_subdomain || - namereln == dns_namereln_equal) { + namereln == dns_namereln_equal) + { return (true); } @@ -1229,7 +1230,8 @@ dns_name_totext2(const dns_name_t *name, unsigned int options, case 0x40: /* '@' */ case 0x24: /* '$' */ if ((options & DNS_NAME_MASTERFILE) == - 0) { + 0) + { goto no_escape; } FALLTHROUGH; diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c index c97d31bf35c..ba6716a88a5 100644 --- a/lib/dns/ncache.c +++ b/lib/dns/ncache.c @@ -172,7 +172,8 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, rdataset = ISC_LIST_NEXT(rdataset, link)) { if ((rdataset->attributes & - DNS_RDATASETATTR_NCACHE) == 0) { + DNS_RDATASETATTR_NCACHE) == 0) + { continue; } type = rdataset->type; @@ -639,7 +640,8 @@ dns_ncache_getsigrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name, isc_region_consume(&remaining, 2); if (type != dns_rdatatype_rrsig || - !dns_name_equal(&tname, name)) { + !dns_name_equal(&tname, name)) + { result = dns_rdataset_next(&rclone); dns_rdata_reset(&rdata); continue; diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c index 84c47d6c215..94f2b26b79f 100644 --- a/lib/dns/nsec.c +++ b/lib/dns/nsec.c @@ -156,7 +156,8 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, { for (i = 0; i <= max_type; i++) { if (dns_nsec_isset(bm, i) && - !dns_rdatatype_iszonecutauth((dns_rdatatype_t)i)) { + !dns_rdatatype_iszonecutauth((dns_rdatatype_t)i)) + { dns_nsec_setbit(bm, i, 0); } } @@ -296,7 +297,8 @@ dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version, dns_diff_t *diff, { if (tuple->rdata.type != dns_rdatatype_dnskey || - tuple->op != DNS_DIFFOP_DEL) { + tuple->op != DNS_DIFFOP_DEL) + { continue; } diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c index 253de1cab74..55fc52a766d 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c @@ -145,7 +145,8 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, * a NS record but do have other data. */ if (rdataset.type == dns_rdatatype_soa || - rdataset.type == dns_rdatatype_ds) { + rdataset.type == dns_rdatatype_ds) + { need_rrsig = true; } else if (rdataset.type == dns_rdatatype_ns) { found_ns = true; @@ -170,7 +171,8 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, { for (i = 0; i <= max_type; i++) { if (dns_nsec_isset(bm, i) && - !dns_rdatatype_iszonecutauth((dns_rdatatype_t)i)) { + !dns_rdatatype_iszonecutauth((dns_rdatatype_t)i)) + { dns_nsec_setbit(bm, i, 0); } } @@ -486,7 +488,8 @@ better_param(dns_rdataset_t *nsec3paramset, dns_rdata_t *param) { dns_rdata_t tmprdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &tmprdata); if (!dns_nsec3param_fromprivate(&tmprdata, &rdata, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } } else { @@ -1308,7 +1311,8 @@ try_private: dns_rdataset_current(&prdataset, &rdata1); if (!dns_nsec3param_fromprivate(&rdata1, &rdata2, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } CHECK(dns_rdata_tostruct(&rdata2, &nsec3param, NULL)); @@ -1737,7 +1741,8 @@ try_private: dns_rdataset_current(&rdataset, &rdata1); if (!dns_nsec3param_fromprivate(&rdata1, &rdata2, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } CHECK(dns_rdata_tostruct(&rdata2, &nsec3param, NULL)); @@ -1855,7 +1860,8 @@ try_private: dns_rdataset_current(&rdataset, &rdata1); if (!dns_nsec3param_fromprivate(&rdata1, &rdata2, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } result = dns_rdata_tostruct(&rdata2, &nsec3param, NULL); @@ -1963,7 +1969,8 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, * Is this zone the same or deeper than the current zone? */ if (dns_name_countlabels(zonename) == 0 || - dns_name_issubdomain(zone, zonename)) { + dns_name_issubdomain(zone, zonename)) + { dns_name_copy(zone, zonename); } diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c index a3f63885fa3..c08070717ac 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -141,7 +141,8 @@ toresult(isc_result_t fallback) { default: #if defined(ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED) if (lib == ERR_R_ECDSA_LIB && - reason == ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED) { + reason == ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED) + { result = ISC_R_NOENTROPY; break; } diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c index a7cbdbe586c..e32a7d2a191 100644 --- a/lib/dns/openssldh_link.c +++ b/lib/dns/openssldh_link.c @@ -220,7 +220,8 @@ openssldh_compare(const dst_key_t *key1, const dst_key_t *key2) { if (priv_key1 != NULL || priv_key2 != NULL) { if (priv_key1 == NULL || priv_key2 == NULL || - BN_cmp(priv_key1, priv_key2) != 0) { + BN_cmp(priv_key1, priv_key2) != 0) + { DST_RET(false); } } @@ -398,7 +399,8 @@ openssldh_generate(dst_key_t *key, int generator, void (*callback)(int)) { * static parameters which we can use. */ if (key->key_size == 768 || key->key_size == 1024 || - key->key_size == 1536) { + key->key_size == 1536) + { if (key->key_size == 768) { p = BN_dup(bn768); } else if (key->key_size == 1024) { @@ -461,14 +463,16 @@ openssldh_generate(dst_key_t *key, int generator, void (*callback)(int)) { } if (!DH_generate_parameters_ex(dh, key->key_size, generator, - cb)) { + cb)) + { DST_RET(dst__openssl_toresult2("DH_generate_parameters_" "ex", DST_R_OPENSSLFAILURE)); } #else if (OSSL_PARAM_BLD_push_int(bld, OSSL_PKEY_PARAM_DH_GENERATOR, - generator) != 1) { + generator) != 1) + { DST_RET(dst__openssl_toresult2("OSSL_PARAM_BLD_push_" "int", DST_R_OPENSSLFAILURE)); @@ -526,7 +530,8 @@ openssldh_generate(dst_key_t *key, int generator, void (*callback)(int)) { DST_R_OPENSSLFAILURE)); } if (EVP_PKEY_paramgen(param_ctx, ¶m_pkey) != 1 || - param_pkey == NULL) { + param_pkey == NULL) + { DST_RET(dst__openssl_toresult2("EVP_PKEY_paramgen", DST_R_OPENSSLFAILURE)); } diff --git a/lib/dns/opensslecdsa_link.c b/lib/dns/opensslecdsa_link.c index f04f076e421..3422f3beba7 100644 --- a/lib/dns/opensslecdsa_link.c +++ b/lib/dns/opensslecdsa_link.c @@ -234,14 +234,16 @@ opensslecdsa_adddata(dst_context_t *dctx, const isc_region_t *data) { if (dctx->use == DO_SIGN) { if (EVP_DigestSignUpdate(evp_md_ctx, data->base, - data->length) != 1) { + data->length) != 1) + { DST_RET(dst__openssl_toresult3(dctx->category, "EVP_DigestSignUpdate", ISC_R_FAILURE)); } } else { if (EVP_DigestVerifyUpdate(evp_md_ctx, data->base, - data->length) != 1) { + data->length) != 1) + { DST_RET(dst__openssl_toresult3(dctx->category, "EVP_DigestVerifyUpdate", ISC_R_FAILURE)); @@ -775,7 +777,8 @@ opensslecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) { memmove(buf + 1, r.base, len); cp = buf; if (o2i_ECPublicKey(&eckey, (const unsigned char **)&cp, - (long)len + 1) == NULL) { + (long)len + 1) == NULL) + { DST_RET(dst__openssl_toresult(DST_R_INVALIDPUBLICKEY)); } if (EC_KEY_check_key(eckey) != 1) { @@ -1008,7 +1011,8 @@ ecdsa_check(EVP_PKEY **pkey, EVP_PKEY *pubpkey) { DST_RET(ISC_R_FAILURE); } if (OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY, - priv) != 1) { + priv) != 1) + { DST_RET(ISC_R_FAILURE); } if (OSSL_PARAM_BLD_push_octet_string(bld, diff --git a/lib/dns/openssleddsa_link.c b/lib/dns/openssleddsa_link.c index fa8d51b1efa..f89672b26e1 100644 --- a/lib/dns/openssleddsa_link.c +++ b/lib/dns/openssleddsa_link.c @@ -190,7 +190,8 @@ openssleddsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { dctx->category, "EVP_DigestSignInit", ISC_R_FAILURE)); } if (EVP_DigestSign(ctx, sigreg.base, &siglen, tbsreg.base, - tbsreg.length) != 1) { + tbsreg.length) != 1) + { DST_RET(dst__openssl_toresult3(dctx->category, "EVP_DigestSign", DST_R_SIGNFAILURE)); } @@ -459,7 +460,8 @@ openssleddsa_tofile(const dst_key_t *key, const char *directory) { } buf = isc_mem_get(key->mctx, len); if (EVP_PKEY_get_raw_private_key(key->keydata.pkey, buf, - &len) != 1) { + &len) != 1) + { DST_RET(dst__openssl_toresult(ISC_R_FAILURE)); } priv.elements[i].tag = TAG_EDDSA_PRIVATEKEY; diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c index bc89ca9a089..7fbf3e205cf 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c @@ -299,7 +299,8 @@ opensslrsa_compare(const dst_key_t *key1, const dst_key_t *key2) { #endif /* OPENSSL_VERSION_NUMBER < 0x30000000L || OPENSSL_API_LEVEL < 30000 */ if (BN_cmp(d1, d2) != 0 || BN_cmp(p1, p2) != 0 || - BN_cmp(q1, q2) != 0) { + BN_cmp(q1, q2) != 0) + { DST_RET(false); } } @@ -1311,15 +1312,18 @@ opensslrsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) { } if (n != NULL && - OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_N, n) != 1) { + OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_N, n) != 1) + { DST_RET(dst__openssl_toresult(DST_R_OPENSSLFAILURE)); } if (e != NULL && - OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_E, e) != 1) { + OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_E, e) != 1) + { DST_RET(dst__openssl_toresult(DST_R_OPENSSLFAILURE)); } if (d != NULL && - OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_D, d) != 1) { + OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_D, d) != 1) + { DST_RET(dst__openssl_toresult(DST_R_OPENSSLFAILURE)); } if (p != NULL && @@ -1368,7 +1372,8 @@ opensslrsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) { } if (rsa_check(pkey, pub != NULL ? pub->keydata.pkey : NULL) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { DST_RET(dst__openssl_toresult(DST_R_INVALIDPRIVATEKEY)); } #endif /* OPENSSL_VERSION_NUMBER < 0x30000000L || OPENSSL_API_LEVEL < 30000 */ diff --git a/lib/dns/order.c b/lib/dns/order.c index b3112d32ddf..477576c9e7c 100644 --- a/lib/dns/order.c +++ b/lib/dns/order.c @@ -111,7 +111,8 @@ dns_order_find(dns_order_t *order, const dns_name_t *name, continue; } if (ent->rdclass != rdclass && - ent->rdclass != dns_rdataclass_any) { + ent->rdclass != dns_rdataclass_any) + { continue; } if (match(name, dns_fixedname_name(&ent->name))) { diff --git a/lib/dns/peer.c b/lib/dns/peer.c index bca288c4bba..3f2c4c0c2ed 100644 --- a/lib/dns/peer.c +++ b/lib/dns/peer.c @@ -187,7 +187,8 @@ dns_peerlist_addpeer(dns_peerlist_t *peers, dns_peer_t *peer) { * More specifics to front of list. */ for (p = ISC_LIST_HEAD(peers->elements); p != NULL; - p = ISC_LIST_NEXT(p, next)) { + p = ISC_LIST_NEXT(p, next)) + { if (p->prefixlen < peer->prefixlen) { break; } @@ -212,7 +213,8 @@ dns_peerlist_peerbyaddr(dns_peerlist_t *servers, const isc_netaddr_t *addr, server = ISC_LIST_HEAD(servers->elements); while (server != NULL) { if (isc_netaddr_eqprefix(addr, &server->address, - server->prefixlen)) { + server->prefixlen)) + { break; } diff --git a/lib/dns/private.c b/lib/dns/private.c index cbf947f8ccc..56573b3a412 100644 --- a/lib/dns/private.c +++ b/lib/dns/private.c @@ -72,7 +72,8 @@ ignore(dns_rdata_t *param, dns_rdataset_t *privateset) { dns_rdataset_current(privateset, &private); if (!dns_nsec3param_fromprivate(&private, &rdata, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } /* @@ -178,7 +179,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, dns_rdataset_current(&privateset, &private); if (!dns_nsec3param_fromprivate(&private, &rdata, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } if (REMOVE(rdata.data[1])) { @@ -215,7 +217,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, dns_rdataset_current(&privateset, &private); if (!dns_nsec3param_fromprivate(&private, &rdata, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } if (CREATE(rdata.data[1])) { @@ -283,7 +286,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, dns_rdataset_current(&privateset, &private); if (!dns_nsec3param_fromprivate(&private, &rdata, buf, - sizeof(buf))) { + sizeof(buf))) + { /* * Look for record that says we are signing the * zone with a key. @@ -347,7 +351,8 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) { isc_buffer_t b; if (!dns_nsec3param_fromprivate(private, &rdata, nsec3buf, - sizeof(nsec3buf))) { + sizeof(nsec3buf))) + { CHECK(ISC_R_FAILURE); } diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index 7a6d653fdb0..2f51e9564d3 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -653,7 +653,8 @@ dns_rbt_addnode(dns_rbt_t *rbt, const dns_name_t *name, dns_rbtnode_t **nodep) { hash_node(rbt, new_current, new_name); if (common_labels == - dns_name_countlabels(add_name)) { + dns_name_countlabels(add_name)) + { /* * The name has been added by pushing * the not-in-common parts down to @@ -728,7 +729,8 @@ dns_rbt_addname(dns_rbt_t *rbt, const dns_name_t *name, void *data) { * there is data associated with a node. */ if (result == ISC_R_SUCCESS || - (result == ISC_R_EXISTS && node->data == NULL)) { + (result == ISC_R_EXISTS && node->data == NULL)) + { node->data = data; result = ISC_R_SUCCESS; } @@ -1246,7 +1248,8 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, result2 = dns_rbtnodechain_prev( chain, NULL, NULL); if (result2 == ISC_R_SUCCESS || - result2 == DNS_R_NEWORIGIN) { + result2 == DNS_R_NEWORIGIN) + { /* Nothing. */ } else if (result2 == ISC_R_NOMORE) { /* @@ -1680,7 +1683,8 @@ maybe_rehash(dns_rbt_t *rbt, size_t newcount) { uint32_t newbits = rehash_bits(rbt, newcount); if (rbt->hashbits[rbt->hindex] < newbits && - newbits <= ISC_HASH_MAX_BITS) { + newbits <= ISC_HASH_MAX_BITS) + { hashtable_rehash(rbt, newbits); } } @@ -2105,7 +2109,8 @@ deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) { INSIST(sibling != NULL); if (IS_BLACK(sibling->left) && - IS_BLACK(sibling->right)) { + IS_BLACK(sibling->right)) + { sibling->color = RED; child = parent; } else { @@ -2141,7 +2146,8 @@ deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) { INSIST(sibling != NULL); if (IS_BLACK(sibling->left) && - IS_BLACK(sibling->right)) { + IS_BLACK(sibling->right)) + { sibling->color = RED; child = parent; } else { @@ -2292,7 +2298,8 @@ check_properties_helper(dns_rbtnode_t *node) { * a subtree root and must have the flag set. */ if (((!node->parent) || (node->parent->down == node)) && - (!node->is_root)) { + (!node->is_root)) + { return (false); } @@ -2700,7 +2707,8 @@ dns_rbtnodechain_prev(dns_rbtnodechain_t *chain, dns_name_t *name, * the origin for the second level tree. */ if (origin != NULL && - (chain->level_count > 0 || predecessor->offsetlen > 1)) { + (chain->level_count > 0 || predecessor->offsetlen > 1)) + { new_origin = true; } } diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 15dcb6a128e..ec8b9809ab1 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -1599,7 +1599,8 @@ rollback_node(dns_rbtnode_t *node, rbtdb_serial_t serial) { make_dirty = true; } for (dcurrent = header->down; dcurrent != NULL; - dcurrent = dcurrent->down) { + dcurrent = dcurrent->down) + { if (dcurrent->serial == serial) { RDATASET_ATTR_SET(dcurrent, RDATASET_ATTR_IGNORE); @@ -1739,11 +1740,13 @@ clean_zone_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, */ dparent = current; for (dcurrent = current->down; dcurrent != NULL; - dcurrent = down_next) { + dcurrent = down_next) + { down_next = dcurrent->down; INSIST(dcurrent->serial <= dparent->serial); if (dcurrent->serial == dparent->serial || - IGNORE(dcurrent)) { + IGNORE(dcurrent)) + { if (down_next != NULL) { down_next->next = dparent; } @@ -1794,7 +1797,8 @@ clean_zone_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, */ dparent = current; for (dcurrent = current->down; dcurrent != NULL; - dcurrent = down_next) { + dcurrent = down_next) + { down_next = dcurrent->down; if (dcurrent->serial < least_serial) { break; @@ -1988,7 +1992,8 @@ cleanup_dead_nodes(dns_rbtdb_t *rbtdb, int bucketnum) { * and we have to do it now. */ if (isc_refcount_current(&node->references) != 0 || - node->data != NULL) { + node->data != NULL) + { node = ISC_LIST_HEAD(rbtdb->deadnodes[bucketnum]); count--; continue; @@ -2118,7 +2123,8 @@ decrement_reference(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, /* Upgrade the lock? */ if (*nlocktypep == isc_rwlocktype_read) { if (NODE_TRYUPGRADE(&nodelock->lock, nlocktypep) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { NODE_UNLOCK(&nodelock->lock, nlocktypep); NODE_WRLOCK(&nodelock->lock, nlocktypep); } @@ -2417,7 +2423,8 @@ setnsec3parameters(dns_db_t *db, rbtdb_version_t *version) { header_next = header->next; do { if (header->serial <= version->serial && - !IGNORE(header)) { + !IGNORE(header)) + { if (NONEXISTENT(header)) { header = NULL; } @@ -2428,7 +2435,8 @@ setnsec3parameters(dns_db_t *db, rbtdb_version_t *version) { } while (header != NULL); if (header != NULL && - (header->type == dns_rdatatype_nsec3param)) { + (header->type == dns_rdatatype_nsec3param)) + { /* * Find A NSEC3PARAM with a supported algorithm. */ @@ -2698,7 +2706,8 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) { * Commit/rollback re-signed headers. */ for (header = HEAD(resigned_list); header != NULL; - header = HEAD(resigned_list)) { + header = HEAD(resigned_list)) + { nodelock_t *lock; isc_rwlocktype_t tlocktype = isc_rwlocktype_none; isc_rwlocktype_t nlocktype = isc_rwlocktype_none; @@ -2740,7 +2749,8 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) { } for (changed = HEAD(cleanup_list); changed != NULL; - changed = next_changed) { + changed = next_changed) + { nodelock_t *lock; isc_rwlocktype_t nlocktype = isc_rwlocktype_none; @@ -2884,7 +2894,8 @@ findnodeintree(dns_rbtdb_t *rbtdb, dns_rbt_t *tree, const dns_name_t *name, * Try to upgrade the lock and if that fails unlock then relock. */ if (TREE_TRYUPGRADE(&rbtdb->tree_lock, &tlocktype) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { TREE_UNLOCK(&rbtdb->tree_lock, &tlocktype); TREE_WRLOCK(&rbtdb->tree_lock, &tlocktype); } @@ -2986,7 +2997,8 @@ zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { { do { if (header->serial <= search->serial && - !IGNORE(header)) { + !IGNORE(header)) + { /* * Is this a "this rdataset doesn't * exist" record? @@ -3003,10 +3015,12 @@ zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { if (header->type == dns_rdatatype_dname) { dname_header = header; } else if (header->type == - RBTDB_RDATATYPE_SIGDNAME) { + RBTDB_RDATATYPE_SIGDNAME) + { sigdname_header = header; } else if (node != onode || - IS_STUB(search->rbtdb)) { + IS_STUB(search->rbtdb)) + { /* * We've found an NS rdataset that * isn't at the origin node. We check @@ -3025,7 +3039,8 @@ zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { * Did we find anything? */ if (!IS_CACHE(search->rbtdb) && !IS_STUB(search->rbtdb) && - ns_header != NULL) { + ns_header != NULL) + { /* * Note that NS has precedence over DNAME if both exist * in a zone. Otherwise DNAME take precedence over NS. @@ -3369,7 +3384,8 @@ activeempty(rbtdb_search_t *search, dns_rbtnodechain_t *chain, for (header = node->data; header != NULL; header = header->next) { if (header->serial <= search->serial && - !IGNORE(header) && EXISTS(header)) { + !IGNORE(header) && EXISTS(header)) + { break; } } @@ -3438,7 +3454,8 @@ activeemptynode(rbtdb_search_t *search, const dns_name_t *qname, for (header = node->data; header != NULL; header = header->next) { if (header->serial <= search->serial && - !IGNORE(header) && EXISTS(header)) { + !IGNORE(header) && EXISTS(header)) + { break; } } @@ -3469,7 +3486,8 @@ activeemptynode(rbtdb_search_t *search, const dns_name_t *qname, for (header = node->data; header != NULL; header = header->next) { if (header->serial <= search->serial && - !IGNORE(header) && EXISTS(header)) { + !IGNORE(header) && EXISTS(header)) + { break; } } @@ -3614,7 +3632,8 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep, lock = &rbtdb->node_locks[wnode->locknum].lock; NODE_RDLOCK(lock, &nlocktype); for (header = wnode->data; header != NULL; - header = header->next) { + header = header->next) + { if (header->serial <= search->serial && !IGNORE(header) && EXISTS(header) && !ANCIENT(header)) @@ -3624,9 +3643,11 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep, } NODE_UNLOCK(lock, &nlocktype); if (header != NULL || - activeempty(search, &wchain, wname)) { + activeempty(search, &wchain, wname)) + { if (activeemptynode(search, qname, - wname)) { + wname)) + { return (ISC_R_NOTFOUND); } /* @@ -3639,7 +3660,8 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep, break; } } else if (result != ISC_R_NOTFOUND && - result != DNS_R_PARTIALMATCH) { + result != DNS_R_PARTIALMATCH) + { /* * An error has occurred. Bail out. */ @@ -3765,7 +3787,8 @@ previous_closest_nsec(dns_rdatatype_t type, rbtdb_search_t *search, result = ISC_R_SUCCESS; } } else if (result == ISC_R_NOTFOUND || - result == DNS_R_PARTIALMATCH) { + result == DNS_R_PARTIALMATCH) + { result = dns_rbtnodechain_current( nsecchain, name, origin, NULL); if (result == ISC_R_NOTFOUND) { @@ -3881,7 +3904,8 @@ again: */ do { if (header->serial <= search->serial && - !IGNORE(header)) { + !IGNORE(header)) + { /* * Is this a "this rdataset doesn't * exist" record? @@ -3925,7 +3949,8 @@ again: type, search, name, origin, &prevnode, NULL, NULL); } else if (found != NULL && - (foundsig != NULL || !need_sig)) { + (foundsig != NULL || !need_sig)) + { /* * We've found the right NSEC/NSEC3 record. * @@ -4275,7 +4300,8 @@ found: * we are using behave as if it isn't here. */ if (header->type == dns_rdatatype_nsec3 && - !matchparams(header, &search)) { + !matchparams(header, &search)) + { NODE_UNLOCK(lock, &nlocktype); goto partial_match; } @@ -4291,7 +4317,8 @@ found: */ found = header; if (header->type == dns_rdatatype_cname && - cname_ok) { + cname_ok) + { /* * We may be finding a CNAME instead * of the desired type. @@ -4326,7 +4353,8 @@ found: break; } } else if (header->type == dns_rdatatype_nsec && - !search.rbtversion->havensec3) { + !search.rbtversion->havensec3) + { /* * Remember a NSEC rdataset even if we're * not specifically looking for it, because @@ -4342,7 +4370,8 @@ found: */ nsecsig = header; } else if (cname_ok && - header->type == RBTDB_RDATATYPE_SIGCNAME) { + header->type == RBTDB_RDATATYPE_SIGCNAME) + { /* * If we get a CNAME match, we'll also need * its signature. @@ -4409,7 +4438,8 @@ found: goto tree_exit; } if ((search.options & DNS_DBFIND_FORCENSEC) != 0 && - nsecheader == NULL) { + nsecheader == NULL) + { /* * There's no NSEC record, and we were told * to find one. @@ -4590,7 +4620,8 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header, RDATASET_ATTR_CLR(header, RDATASET_ATTR_STALE_WINDOW); if (!ZEROTTL(header) && KEEPSTALE(search->rbtdb) && - stale > search->now) { + stale > search->now) + { mark_header_stale(search->rbtdb, header); *header_prev = header; /* @@ -4620,7 +4651,8 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header, RDATASET_ATTR_STALE_WINDOW); return (false); } else if ((search->options & - DNS_DBFIND_STALETIMEOUT) != 0) { + DNS_DBFIND_STALETIMEOUT) != 0) + { /* * We want stale RRset due to timeout, so we * don't skip it. @@ -4711,7 +4743,8 @@ cache_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { for (header = node->data; header != NULL; header = header_next) { header_next = header->next; if (check_stale_header(node, header, &nlocktype, lock, search, - &header_prev)) { + &header_prev)) + { /* Do nothing. */ } else if (header->type == dns_rdatatype_dname && EXISTS(header) && !ANCIENT(header)) @@ -4787,7 +4820,8 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, { header_next = header->next; if (check_stale_header(node, header, &nlocktype, lock, - search, &header_prev)) { + search, &header_prev)) + { /* Do nothing. */ } else if (EXISTS(header) && !ANCIENT(header)) { /* @@ -4800,7 +4834,8 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, break; } } else if (header->type == - RBTDB_RDATATYPE_SIGNS) { + RBTDB_RDATATYPE_SIGNS) + { foundsig = header; if (found != NULL) { break; @@ -4859,7 +4894,8 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, { if (nlocktype != isc_rwlocktype_write) { if (NODE_TRYUPGRADE(lock, &nlocktype) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { NODE_UNLOCK(lock, &nlocktype); NODE_WRLOCK(lock, &nlocktype); } @@ -4870,7 +4906,8 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, search->now); } if (foundsig != NULL && - need_headerupdate(foundsig, search->now)) { + need_headerupdate(foundsig, search->now)) + { update_header(search->rbtdb, foundsig, search->now); } @@ -4966,11 +5003,13 @@ find_coveringnsec(rbtdb_search_t *search, const dns_name_t *name, for (header = node->data; header != NULL; header = header_next) { header_next = header->next; if (check_stale_header(node, header, &nlocktype, lock, search, - &header_prev)) { + &header_prev)) + { continue; } if (NONEXISTENT(header) || - RBTDB_RDATATYPE_BASE(header->type) == 0) { + RBTDB_RDATATYPE_BASE(header->type) == 0) + { header_prev = header; continue; } @@ -5129,7 +5168,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, for (header = node->data; header != NULL; header = header_next) { header_next = header->next; if (check_stale_header(node, header, &nlocktype, lock, &search, - &header_prev)) { + &header_prev)) + { /* Do nothing. */ } else if (EXISTS(header) && !ANCIENT(header)) { /* @@ -5138,7 +5178,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, */ empty_node = false; if (header->noqname != NULL && - header->trust == dns_trust_secure) { + header->trust == dns_trust_secure) + { found_noqname = true; } if (!NEGATIVE(header)) { @@ -5159,7 +5200,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, */ found = header; if (header->type == dns_rdatatype_cname && - cname_ok && cnamesig != NULL) { + cname_ok && cnamesig != NULL) + { /* * If we've already got the * CNAME RRSIG, use it. @@ -5173,7 +5215,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, */ foundsig = header; } else if (header->type == RBTDB_RDATATYPE_NCACHEANY || - header->type == negtype) { + header->type == negtype) + { /* * We've found a negative cache entry. */ @@ -5196,7 +5239,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, } else if (header->type == RBTDB_RDATATYPE_SIGNSEC) { nsecsig = header; } else if (cname_ok && - header->type == RBTDB_RDATATYPE_SIGCNAME) { + header->type == RBTDB_RDATATYPE_SIGCNAME) + { /* * If we get a CNAME match, we'll also need * its signature. @@ -5242,7 +5286,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, * Return covering NODATA NSEC record. */ if ((search.options & DNS_DBFIND_COVERINGNSEC) != 0 && - nsecheader != NULL) { + nsecheader != NULL) + { if (nodep != NULL) { new_reference(search.rbtdb, node, nlocktype); *nodep = node; @@ -5366,7 +5411,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, node_exit: if ((update != NULL || updatesig != NULL) && - nlocktype != isc_rwlocktype_write) { + nlocktype != isc_rwlocktype_write) + { if (NODE_TRYUPGRADE(lock, &nlocktype) != ISC_R_SUCCESS) { NODE_UNLOCK(lock, &nlocktype); NODE_WRLOCK(lock, &nlocktype); @@ -5481,7 +5527,8 @@ cache_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, for (header = node->data; header != NULL; header = header_next) { header_next = header->next; if (check_stale_header(node, header, &nlocktype, lock, &search, - &header_prev)) { + &header_prev)) + { /* * The function dns_rbt_findnode found us the a matching * node for 'name' and stored the result in 'dcname'. @@ -5613,9 +5660,11 @@ detachnode(dns_db_t *db, dns_dbnode_t **targetp) { NODE_RDLOCK(&nodelock->lock, &nlocktype); if (decrement_reference(rbtdb, node, 0, &nlocktype, &tlocktype, true, - false)) { + false)) + { if (isc_refcount_current(&nodelock->references) == 0 && - nodelock->exiting) { + nodelock->exiting) + { inactive = true; } } @@ -5706,7 +5755,8 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) { for (header = rbtnode->data; header != NULL; header = header->next) { if (header->rdh_ttl + STALE_TTL(header, rbtdb) <= - now - RBTDB_VIRTUAL) { + now - RBTDB_VIRTUAL) + { /* * We don't check if refcurrent(rbtnode) == 0 and try * to free like we do in cache_find(), because @@ -5769,7 +5819,8 @@ printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) { rdatasetheader_t *current, *top_next; for (current = rbtnode->data; current != NULL; - current = top_next) { + current = top_next) + { top_next = current->next; first = true; fprintf(out, "\ttype %u", current->type); @@ -5997,7 +6048,8 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, if (header->type == matchtype) { found = header; } else if (header->type == RBTDB_RDATATYPE_NCACHEANY || - header->type == negtype) { + header->type == negtype) + { found = header; } else if (header->type == sigmatchtype) { foundsig = header; @@ -6136,7 +6188,8 @@ cname_and_other_data(dns_rbtnode_t *node, rbtdb_serial_t serial) { */ do { if (header->serial <= serial && - !IGNORE(header)) { + !IGNORE(header)) + { /* * Is this a "this rdataset * doesn't exist" record? @@ -6297,7 +6350,8 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, const dns_name_t *nodename, */ for (topheader = rbtnode->data; topheader != NULL; - topheader = topheader->next) { + topheader = topheader->next) + { set_ttl(rbtdb, topheader, 0); mark_header_ancient(rbtdb, topheader); } @@ -6308,7 +6362,8 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, const dns_name_t *nodename, * type so they can be marked ancient later. */ for (topheader = rbtnode->data; topheader != NULL; - topheader = topheader->next) { + topheader = topheader->next) + { if (topheader->type == sigtype) { sigheader = topheader; } @@ -6324,7 +6379,8 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, const dns_name_t *nodename, * entry which covers the same type as the RRSIG. */ for (topheader = rbtnode->data; topheader != NULL; - topheader = topheader->next) { + topheader = topheader->next) + { if ((topheader->type == RBTDB_RDATATYPE_NCACHEANY) || (newheader->type == sigtype && @@ -6335,7 +6391,8 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, const dns_name_t *nodename, } } if (topheader != NULL && EXISTS(topheader) && - ACTIVE(topheader, now)) { + ACTIVE(topheader, now)) + { /* * Found one. */ @@ -6369,9 +6426,11 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, const dns_name_t *nodename, } for (topheader = rbtnode->data; topheader != NULL; - topheader = topheader->next) { + topheader = topheader->next) + { if (topheader->type == newheader->type || - topheader->type == negtype) { + topheader->type == negtype) + { break; } topheader_prev = topheader; @@ -6511,12 +6570,14 @@ find_header: set_ttl(rbtdb, header, newheader->rdh_ttl); } if (header->noqname == NULL && - newheader->noqname != NULL) { + newheader->noqname != NULL) + { header->noqname = newheader->noqname; newheader->noqname = NULL; } if (header->closest == NULL && - newheader->closest != NULL) { + newheader->closest != NULL) + { header->closest = newheader->closest; newheader->closest = NULL; } @@ -6561,12 +6622,14 @@ find_header: set_ttl(rbtdb, header, newheader->rdh_ttl); } if (header->noqname == NULL && - newheader->noqname != NULL) { + newheader->noqname != NULL) + { header->noqname = newheader->noqname; newheader->noqname = NULL; } if (header->closest == NULL && - newheader->closest != NULL) { + newheader->closest != NULL) + { header->closest = newheader->closest; newheader->closest = NULL; } @@ -6734,7 +6797,8 @@ find_header: * Check if the node now contains CNAME and other data. */ if (rbtversion != NULL && - cname_and_other_data(rbtnode, rbtversion->serial)) { + cname_and_other_data(rbtnode, rbtversion->serial)) + { return (DNS_R_CNAMEANDOTHER); } @@ -6883,7 +6947,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * SOA records are only allowed at top of zone. */ if (rdataset->type == dns_rdatatype_soa && - node != rbtdb->origin_node) { + node != rbtdb->origin_node) + { return (DNS_R_NOTZONETOP); } TREE_RDLOCK(&rbtdb->tree_lock, &tlocktype); @@ -7050,7 +7115,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * node lock. */ if (tlocktype == isc_rwlocktype_write && !delegating && - !newnsec) { + !newnsec) + { TREE_UNLOCK(&rbtdb->tree_lock, &tlocktype); } } @@ -7171,7 +7237,8 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, topheader_prev = NULL; for (topheader = rbtnode->data; topheader != NULL; - topheader = topheader->next) { + topheader = topheader->next) + { if (topheader->type == newheader->type) { break; } @@ -7569,7 +7636,8 @@ loading_addrdataset(void *arg, const dns_name_t *name, NODE_UNLOCK(&rbtdb->node_locks[node->locknum].lock, &nlocktype); if (result == ISC_R_SUCCESS && - delegating_type(rbtdb, node, rdataset->type)) { + delegating_type(rbtdb, node, rdataset->type)) + { node->find_callback = 1; } else if (result == DNS_R_UNCHANGED) { result = ISC_R_SUCCESS; @@ -9618,7 +9686,8 @@ rehash_bits(rbtdb_version_t *version, size_t newcount) { uint32_t newbits = oldbits; while (newcount >= ISC_HASHSIZE(newbits) && - newbits <= ISC_HASH_MAX_BITS) { + newbits <= ISC_HASH_MAX_BITS) + { newbits += 1; } @@ -9649,7 +9718,8 @@ rehash_gluetable(rbtdb_version_t *version) { rbtdb_glue_table_node_t *gluenode; rbtdb_glue_table_node_t *nextgluenode; for (gluenode = oldtable[i]; gluenode != NULL; - gluenode = nextgluenode) { + gluenode = nextgluenode) + { uint32_t hash = isc_hash32( &gluenode->node, sizeof(gluenode->node), true); uint32_t idx = isc_hash_bits32(hash, newbits); diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c index b1459009d39..b7fa16e380d 100644 --- a/lib/dns/rcode.c +++ b/lib/dns/rcode.c @@ -220,7 +220,8 @@ maybe_numeric(unsigned int *valuep, isc_textregion_t *source, unsigned int max, int v; if (!isdigit((unsigned char)source->base[0]) || - source->length > NUMBERSIZE - 1) { + source->length > NUMBERSIZE - 1) + { return (ISC_R_BADNUMBER); } diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 90d5a5428c8..13cccae9f62 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -506,7 +506,8 @@ typemap_totext(isc_region_t *sr, dns_rdata_textctx_t *tctx, for (i = 0; i < sr->length; i += len) { if (tctx != NULL && - (tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { + (tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) + { RETERR(str_totext(tctx->linebreak, target)); first = true; } @@ -1016,7 +1017,8 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, unknown = false; if (token.type == isc_tokentype_string && - strcmp(DNS_AS_STR(token), "\\#") == 0) { + strcmp(DNS_AS_STR(token), "\\#") == 0) + { /* * If this is a TXT record '\#' could be a escaped '#'. * Look to see if the next token is a number and if so @@ -1064,7 +1066,8 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, } break; } else if (token.type != isc_tokentype_eol && - token.type != isc_tokentype_eof) { + token.type != isc_tokentype_eof) + { if (result == ISC_R_SUCCESS) { result = DNS_R_EXTRATOKEN; } @@ -1140,7 +1143,8 @@ unknown_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, tctx->linebreak, target); } if (result == ISC_R_SUCCESS && - (tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { + (tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) + { result = str_totext(" )", target); } } @@ -2207,7 +2211,8 @@ dns_rdatatype_issingleton(dns_rdatatype_t type) { bool dns_rdatatype_notquestion(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_NOTQUESTION) != - 0) { + 0) + { return (true); } return (false); @@ -2216,7 +2221,8 @@ dns_rdatatype_notquestion(dns_rdatatype_t type) { bool dns_rdatatype_questiononly(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_QUESTIONONLY) != - 0) { + 0) + { return (true); } return (false); @@ -2242,7 +2248,8 @@ dns_rdatatype_atparent(dns_rdatatype_t type) { bool dns_rdatatype_followadditional(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & - DNS_RDATATYPEATTR_FOLLOWADDITIONAL) != 0) { + DNS_RDATATYPEATTR_FOLLOWADDITIONAL) != 0) + { return (true); } return (false); @@ -2270,7 +2277,8 @@ dns_rdatatype_isdnssec(dns_rdatatype_t type) { bool dns_rdatatype_iszonecutauth(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_ZONECUTAUTH) != - 0) { + 0) + { return (true); } return (false); diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c index 081622864f5..de042804567 100644 --- a/lib/dns/rdata/any_255/tsig_250.c +++ b/lib/dns/rdata/any_255/tsig_250.c @@ -102,7 +102,8 @@ fromtext_any_tsig(ARGS_FROMTEXT) { RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, false)); if (dns_tsigrcode_fromtext(&rcode, &token.value.as_textregion) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { i = strtol(DNS_AS_STR(token), &e, 10); if (*e != 0) { RETTOK(DNS_R_UNKNOWN); diff --git a/lib/dns/rdata/generic/amtrelay_260.c b/lib/dns/rdata/generic/amtrelay_260.c index 616c6ff2a6b..b2a45a851da 100644 --- a/lib/dns/rdata/generic/amtrelay_260.c +++ b/lib/dns/rdata/generic/amtrelay_260.c @@ -449,7 +449,8 @@ casecompare_amtrelay(ARGS_COMPARE) { dns_rdata_toregion(rdata2, ®ion2); if (memcmp(region1.base, region2.base, 2) != 0 || - (region1.base[1] & 0x7f) != 3) { + (region1.base[1] & 0x7f) != 3) + { return (isc_region_compare(®ion1, ®ion2)); } diff --git a/lib/dns/rdata/generic/caa_257.c b/lib/dns/rdata/generic/caa_257.c index a1b81948cb3..b6845f74a5a 100644 --- a/lib/dns/rdata/generic/caa_257.c +++ b/lib/dns/rdata/generic/caa_257.c @@ -319,7 +319,8 @@ fromtext_caa(ARGS_FROMTEXT) { RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring, false)); if (token.type != isc_tokentype_qstring && - token.type != isc_tokentype_string) { + token.type != isc_tokentype_string) + { RETERR(DNS_R_SYNTAX); } RETERR(multitxt_fromtext(&token.value.as_textregion, target)); diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c index 7a6073f13d1..8680613fd7e 100644 --- a/lib/dns/rdata/generic/isdn_20.c +++ b/lib/dns/rdata/generic/isdn_20.c @@ -39,7 +39,8 @@ fromtext_isdn(ARGS_FROMTEXT) { RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring, true)); if (token.type != isc_tokentype_string && - token.type != isc_tokentype_qstring) { + token.type != isc_tokentype_qstring) + { isc_lex_ungettoken(lexer, &token); return (ISC_R_SUCCESS); } diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c index 6b8a14d9ca3..c8fdfab5f8b 100644 --- a/lib/dns/rdata/generic/key_25.c +++ b/lib/dns/rdata/generic/key_25.c @@ -211,7 +211,8 @@ generic_totext_key(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_RRCOMMENT) != 0) { if (rdata->type == dns_rdatatype_dnskey || - rdata->type == dns_rdatatype_cdnskey) { + rdata->type == dns_rdatatype_cdnskey) + { RETERR(str_totext(" ; ", target)); RETERR(str_totext(keyinfo, target)); } @@ -258,7 +259,8 @@ generic_fromwire_key(ARGS_FROMWIRE) { } if (algorithm == DNS_KEYALG_PRIVATEDNS || - algorithm == DNS_KEYALG_PRIVATEOID) { + algorithm == DNS_KEYALG_PRIVATEOID) + { isc_buffer_t b = *source; RETERR(check_private(&b, algorithm)); } diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c index 4b1e9f182e3..c05e14426d7 100644 --- a/lib/dns/rdata/generic/loc_29.c +++ b/lib/dns/rdata/generic/loc_29.c @@ -180,13 +180,15 @@ get_direction(isc_lex_t *lexer, isc_token_t *token, const char *directions, RETERR(isc_lex_getmastertoken(lexer, token, isc_tokentype_string, false)); if (DNS_AS_STR(*token)[0] == directions[1] && - DNS_AS_STR(*token)[1] == 0) { + DNS_AS_STR(*token)[1] == 0) + { *direction = DNS_AS_STR(*token)[0]; return (ISC_R_SUCCESS); } if (DNS_AS_STR(*token)[0] == directions[0] && - DNS_AS_STR(*token)[1] == 0) { + DNS_AS_STR(*token)[1] == 0) + { *direction = DNS_AS_STR(*token)[0]; return (ISC_R_SUCCESS); } @@ -585,7 +587,8 @@ fromwire_loc(ARGS_FROMWIRE) { c = sr.base[1]; if (c != 0) { if ((c & 0xf) > 9 || ((c >> 4) & 0xf) > 9 || - ((c >> 4) & 0xf) == 0) { + ((c >> 4) & 0xf) == 0) + { return (ISC_R_RANGE); /* @@ -600,7 +603,8 @@ fromwire_loc(ARGS_FROMWIRE) { c = sr.base[2]; if (c != 0) { if ((c & 0xf) > 9 || ((c >> 4) & 0xf) > 9 || - ((c >> 4) & 0xf) == 0) { + ((c >> 4) & 0xf) == 0) + { return (ISC_R_RANGE); /* @@ -615,7 +619,8 @@ fromwire_loc(ARGS_FROMWIRE) { c = sr.base[3]; if (c != 0) { if ((c & 0xf) > 9 || ((c >> 4) & 0xf) > 9 || - ((c >> 4) & 0xf) == 0) { + ((c >> 4) & 0xf) == 0) + { return (ISC_R_RANGE); } } diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c index 0aba846913f..c95944f5ce2 100644 --- a/lib/dns/rdata/generic/rrsig_46.c +++ b/lib/dns/rdata/generic/rrsig_46.c @@ -339,7 +339,8 @@ fromwire_rrsig(ARGS_FROMWIRE) { } if (algorithm == DNS_KEYALG_PRIVATEDNS || - algorithm == DNS_KEYALG_PRIVATEOID) { + algorithm == DNS_KEYALG_PRIVATEOID) + { isc_buffer_t b = *source; RETERR(check_private(&b, algorithm)); } diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c index 1d4b6f7bc03..e21f74b6b7c 100644 --- a/lib/dns/rdata/generic/sig_24.c +++ b/lib/dns/rdata/generic/sig_24.c @@ -302,7 +302,8 @@ fromwire_sig(ARGS_FROMWIRE) { } if (algorithm == DNS_KEYALG_PRIVATEDNS || - algorithm == DNS_KEYALG_PRIVATEOID) { + algorithm == DNS_KEYALG_PRIVATEOID) + { isc_buffer_t b = *source; RETERR(check_private(&b, algorithm)); } diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c index a77054da111..542da502b7a 100644 --- a/lib/dns/rdata/generic/tkey_249.c +++ b/lib/dns/rdata/generic/tkey_249.c @@ -75,7 +75,8 @@ fromtext_tkey(ARGS_FROMTEXT) { RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, false)); if (dns_tsigrcode_fromtext(&rcode, &token.value.as_textregion) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { i = strtol(DNS_AS_STR(token), &e, 10); if (*e != 0) { RETTOK(DNS_R_UNKNOWN); diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c index af960247f0f..a10835f0a3c 100644 --- a/lib/dns/rdata/generic/txt_16.c +++ b/lib/dns/rdata/generic/txt_16.c @@ -39,7 +39,8 @@ generic_fromtext_txt(ARGS_FROMTEXT) { RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring, true)); if (token.type != isc_tokentype_qstring && - token.type != isc_tokentype_string) { + token.type != isc_tokentype_string) + { break; } RETTOK(txt_fromtext(&token.value.as_textregion, target)); diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c index 6d708b0c126..cf5549d4853 100644 --- a/lib/dns/rdata/in_1/a_1.c +++ b/lib/dns/rdata/in_1/a_1.c @@ -227,7 +227,8 @@ checkowner_in_a(ARGS_CHECKOWNER) { dns_name_init(&suffix, NULL); dns_name_split(name, labels - 2, &prefix, &suffix); if (dns_name_equal(&gc_msdcs, &prefix) && - dns_name_ishostname(&suffix, false)) { + dns_name_ishostname(&suffix, false)) + { return (true); } diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c index 00a73d394a4..e23bd472d34 100644 --- a/lib/dns/rdata/in_1/aaaa_28.c +++ b/lib/dns/rdata/in_1/aaaa_28.c @@ -238,7 +238,8 @@ checkowner_in_aaaa(ARGS_CHECKOWNER) { dns_name_split(name, dns_name_countlabels(name) - 2, &prefix, &suffix); if (dns_name_equal(&gc_msdcs, &prefix) && - dns_name_ishostname(&suffix, false)) { + dns_name_ishostname(&suffix, false)) + { return (true); } } diff --git a/lib/dns/rdata/in_1/svcb_64.c b/lib/dns/rdata/in_1/svcb_64.c index 45f223c79f8..2538d44678f 100644 --- a/lib/dns/rdata/in_1/svcb_64.c +++ b/lib/dns/rdata/in_1/svcb_64.c @@ -83,7 +83,8 @@ svcsortkeylist(isc_buffer_t *target, unsigned int used) { /* Reject duplicates. */ while (region.length >= 4) { if (region.base[0] == region.base[2] && - region.base[1] == region.base[3]) { + region.base[1] == region.base[3]) + { return (DNS_R_SYNTAX); } isc_region_consume(®ion, 2); @@ -105,13 +106,15 @@ svcb_validate(uint16_t key, isc_region_t *region) { break; case sbpr_ipv4s: if ((region->length % 4) != 0 || - region->length == 0) { + region->length == 0) + { return (DNS_R_FORMERR); } break; case sbpr_ipv6s: if ((region->length % 16) != 0 || - region->length == 0) { + region->length == 0) + { return (DNS_R_FORMERR); } break; @@ -130,7 +133,8 @@ svcb_validate(uint16_t key, isc_region_t *region) { } case sbpr_keylist: { if ((region->length % 2) != 0 || - region->length == 0) { + region->length == 0) + { return (DNS_R_FORMERR); } /* In order? */ @@ -165,12 +169,14 @@ svcb_validate(uint16_t key, isc_region_t *region) { } /* MUST be UTF8 */ if (!isc_utf8_valid(region->base, - region->length)) { + region->length)) + { return (DNS_R_FORMERR); } /* MUST contain "{?dns}" */ if (strnstr((char *)region->base, "{?dns}", - region->length) == NULL) { + region->length) == NULL) + { return (DNS_R_FORMERR); } break; @@ -219,7 +225,8 @@ svc_keyfromregion(isc_textregion_t *region, char sep, uint16_t *value, } /* No zero padding. */ if (region->length > 1 && *region->base == '0' && - region->base[1] != sep) { + region->base[1] != sep) + { return (DNS_R_SYNTAX); } ul = strtoul(region->base, &e, 10); @@ -455,7 +462,8 @@ svcsortkeys(isc_buffer_t *target, unsigned int used) { /* Lone mandatory field. */ return (DNS_R_DISALLOWED); } else if (key1 == SVCB_NO_DEFAULT_ALPN_KEY && - !have_alpn) { + !have_alpn) + { /* Missing required ALPN field. */ return (DNS_R_DISALLOWED); } @@ -622,7 +630,8 @@ generic_fromtext_in_svcb(ARGS_FROMTEXT) { RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qvpair, true)); if (token.type == isc_tokentype_eol || - token.type == isc_tokentype_eof) { + token.type == isc_tokentype_eof) + { isc_lex_ungettoken(lexer, &token); return (svcsortkeys(target, used)); } diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c index b739a722106..87e2429acf7 100644 --- a/lib/dns/rdatalist.c +++ b/lib/dns/rdatalist.c @@ -199,7 +199,8 @@ isc__rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name) { continue; } if (rdset->type == dns_rdatatype_nsec || - rdset->type == dns_rdatatype_nsec3) { + rdset->type == dns_rdatatype_nsec3) + { neg = rdset; } } @@ -211,7 +212,8 @@ isc__rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name) { rdset = ISC_LIST_NEXT(rdset, link)) { if (rdset->type == dns_rdatatype_rrsig && - rdset->covers == neg->type) { + rdset->covers == neg->type) + { negsig = rdset; } } @@ -271,7 +273,8 @@ isc__rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, rdataset = ISC_LIST_NEXT(rdataset, link)) { if (rdataset->type == dns_rdatatype_rrsig && - rdataset->covers == tneg->type) { + rdataset->covers == tneg->type) + { tnegsig = rdataset; } } @@ -301,7 +304,8 @@ isc__rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) { continue; } if (rdset->type == dns_rdatatype_nsec || - rdset->type == dns_rdatatype_nsec3) { + rdset->type == dns_rdatatype_nsec3) + { neg = rdset; } } @@ -313,7 +317,8 @@ isc__rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) { rdset = ISC_LIST_NEXT(rdset, link)) { if (rdset->type == dns_rdatatype_rrsig && - rdset->covers == neg->type) { + rdset->covers == neg->type) + { negsig = rdset; } } @@ -373,7 +378,8 @@ isc__rdatalist_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, rdataset = ISC_LIST_NEXT(rdataset, link)) { if (rdataset->type == dns_rdatatype_rrsig && - rdataset->covers == tneg->type) { + rdataset->covers == tneg->type) + { tnegsig = rdataset; } } diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c index edd56baa604..85f21fdb841 100644 --- a/lib/dns/rdataset.c +++ b/lib/dns/rdataset.c @@ -413,7 +413,8 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } if (want_cyclic && - (rdataset->count != DNS_RDATASET_COUNT_UNDEFINED)) { + (rdataset->count != DNS_RDATASET_COUNT_UNDEFINED)) + { j = rdataset->count % count; } diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c index c45cb8aa2e8..b36a80cd60b 100644 --- a/lib/dns/rdataslab.c +++ b/lib/dns/rdataslab.c @@ -951,7 +951,8 @@ dns_rdataslab_equal(unsigned char *slab1, unsigned char *slab2, #endif /* if DNS_RDATASET_FIXED */ if (length1 != length2 || - memcmp(current1, current2, length1) != 0) { + memcmp(current1, current2, length1) != 0) + { return (false); } diff --git a/lib/dns/request.c b/lib/dns/request.c index 1ceb1e741cf..1116565cc4e 100644 --- a/lib/dns/request.c +++ b/lib/dns/request.c @@ -607,7 +607,8 @@ dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message, } if (srcaddr != NULL && - isc_sockaddr_pf(srcaddr) != isc_sockaddr_pf(destaddr)) { + isc_sockaddr_pf(srcaddr) != isc_sockaddr_pf(destaddr)) + { return (ISC_R_FAMILYMISMATCH); } diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index fa57133df3a..c14cbf216a7 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -1085,7 +1085,8 @@ fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) { * RRsig from child? */ if (type == dns_rdatatype_rrsig && - rrsig_fromchildzone(fctx, rdataset)) { + rrsig_fromchildzone(fctx, rdataset)) + { return (false); } /* @@ -1120,7 +1121,8 @@ fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) { * A NODATA response to a DS query? */ if (fctx->type == dns_rdatatype_ds && - message->counts[DNS_SECTION_ANSWER] == 0) { + message->counts[DNS_SECTION_ANSWER] == 0) + { return (false); } @@ -1138,7 +1140,8 @@ fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) { { type = rdataset->type; if (type == dns_rdatatype_soa && - dns_name_equal(name, domain)) { + dns_name_equal(name, domain)) + { keep_auth = true; } @@ -1169,7 +1172,8 @@ fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) { * case. */ if (message->counts[DNS_SECTION_ANSWER] == 0 && - fctx->type == dns_rdatatype_any) { + fctx->type == dns_rdatatype_any) + { return (false); } } else if (dns_name_issubdomain(name, domain)) { @@ -1388,7 +1392,8 @@ fctx_cancelquery(resquery_t **queryp, isc_time_t *finish, bool no_response, * context. */ if (fctx->fwdpolicy == dns_fwdpolicy_first && - ISFORWARDER(query->addrinfo)) { + ISFORWARDER(query->addrinfo)) + { add_bad(fctx, query->rmessage, query->addrinfo, ISC_R_TIMEDOUT, badns_forwarder); } @@ -1421,7 +1426,8 @@ fctx_cancelquery(resquery_t **queryp, isc_time_t *finish, bool no_response, * seen a EDNS response. */ if ((query->options & DNS_FETCHOPT_NOEDNS0) == 0 && - !EDNSOK(query->addrinfo)) { + !EDNSOK(query->addrinfo)) + { mask >>= 2; } @@ -1532,7 +1538,8 @@ fctx_cleanup(fetchctx_t *fctx) { fctx->find = NULL; for (find = ISC_LIST_HEAD(fctx->altfinds); find != NULL; - find = next_find) { + find = next_find) + { next_find = ISC_LIST_NEXT(find, publink); ISC_LIST_UNLINK(fctx->altfinds, find, publink); dns_adb_destroyfind(&find); @@ -1541,14 +1548,16 @@ fctx_cleanup(fetchctx_t *fctx) { fctx->altfind = NULL; for (addr = ISC_LIST_HEAD(fctx->forwaddrs); addr != NULL; - addr = next_addr) { + addr = next_addr) + { next_addr = ISC_LIST_NEXT(addr, publink); ISC_LIST_UNLINK(fctx->forwaddrs, addr, publink); dns_adb_freeaddrinfo(fctx->adb, &addr); } for (addr = ISC_LIST_HEAD(fctx->altaddrs); addr != NULL; - addr = next_addr) { + addr = next_addr) + { next_addr = ISC_LIST_NEXT(addr, publink); ISC_LIST_UNLINK(fctx->altaddrs, addr, publink); dns_adb_freeaddrinfo(fctx->adb, &addr); @@ -1782,7 +1791,8 @@ fctx_sendevents(fetchctx_t *fctx, isc_result_t result, int line) { fctx->duration = isc_time_microdiff(&now, &fctx->start); for (event = ISC_LIST_HEAD(fctx->events); event != NULL; - event = next_event) { + event = next_event) + { next_event = ISC_LIST_NEXT(event, ev_link); ISC_LIST_UNLINK(fctx->events, event, ev_link); if (event->ev_type == DNS_EVENT_TRYSTALE) { @@ -1812,7 +1822,8 @@ fctx_sendevents(fetchctx_t *fctx, isc_result_t result, int line) { * Negative results must be indicated in event->result. */ if (dns_rdataset_isassociated(event->rdataset) && - NEGATIVE(event->rdataset)) { + NEGATIVE(event->rdataset)) + { INSIST(event->result == DNS_R_NCACHENXDOMAIN || event->result == DNS_R_NCACHENXRRSET); } @@ -1827,11 +1838,13 @@ fctx_sendevents(fetchctx_t *fctx, isc_result_t result, int line) { { LOCK(&fctx->res->lock); if (count == fctx->res->spillat && - !atomic_load_acquire(&fctx->res->exiting)) { + !atomic_load_acquire(&fctx->res->exiting)) + { old_spillat = fctx->res->spillat; fctx->res->spillat += 5; if (fctx->res->spillat > fctx->res->spillatmax && - fctx->res->spillatmax != 0) { + fctx->res->spillatmax != 0) + { fctx->res->spillat = fctx->res->spillatmax; } new_spillat = fctx->res->spillat; @@ -2591,7 +2604,8 @@ resquery_send(resquery_t *query) { secure_domain = false; } if (secure_domain || - (ISFORWARDER(query->addrinfo) && ntacovered)) { + (ISFORWARDER(query->addrinfo) && ntacovered)) + { fctx->qmessage->flags |= DNS_MESSAGEFLAG_CD; } } @@ -2722,7 +2736,8 @@ resquery_send(resquery_t *query) { result = dns_peer_getednsversion(peer, &ednsversion); if (result == ISC_R_SUCCESS && - ednsversion < version) { + ednsversion < version) + { version = ednsversion; } } @@ -3119,7 +3134,8 @@ bad_server(fetchctx_t *fctx, isc_sockaddr_t *address) { isc_sockaddr_t *sa; for (sa = ISC_LIST_HEAD(fctx->bad); sa != NULL; - sa = ISC_LIST_NEXT(sa, link)) { + sa = ISC_LIST_NEXT(sa, link)) + { if (isc_sockaddr_equal(sa, address)) { return (true); } @@ -3652,7 +3668,8 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) { * Strip label to get the correct forwarder (if any). */ if (dns_rdatatype_atparent(fctx->type) && - dns_name_countlabels(name) > 1) { + dns_name_countlabels(name) > 1) + { dns_name_init(&suffix, NULL); labels = dns_name_countlabels(name); dns_name_getlabelsequence(name, 1, labels - 1, &suffix); @@ -3799,7 +3816,8 @@ normal_nses: alternate_t *a; family = (res->dispatches6 != NULL) ? AF_INET6 : AF_INET; for (a = ISC_LIST_HEAD(res->alternates); a != NULL; - a = ISC_LIST_NEXT(a, link)) { + a = ISC_LIST_NEXT(a, link)) + { if (!a->isaddress) { findname(fctx, &a->_u._n.name, a->_u._n.port, stdoptions, FCTX_ADDRINFO_DUALSTACK, @@ -3928,7 +3946,8 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) { } if (peer != NULL && dns_peer_getbogus(peer, &bogus) == ISC_R_SUCCESS && - bogus) { + bogus) + { aborted = true; } @@ -4183,7 +4202,8 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) { addrinfo = fctx_nextaddress(fctx); while (addrinfo != NULL && - dns_adbentry_overquota(addrinfo->entry)) { + dns_adbentry_overquota(addrinfo->entry)) + { addrinfo = fctx_nextaddress(fctx); } @@ -4841,7 +4861,8 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, * the forwarder). */ if (dns_rdatatype_atparent(fctx->type) && - dns_name_countlabels(name) > 1) { + dns_name_countlabels(name) > 1) + { dns_name_init(&suffix, NULL); labels = dns_name_countlabels(name); dns_name_getlabelsequence(name, 1, labels - 1, &suffix); @@ -5378,7 +5399,8 @@ has_000_label(dns_rdataset_t *nsecset) { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); if (rdata.length > 1 && rdata.data[0] == 1 && - rdata.data[1] == 0) { + rdata.data[1] == 0) + { dns_rdataset_disassociate(&rdataset); return (true); } @@ -5532,7 +5554,8 @@ validated(isc_task_t *task, isc_event_t *event) { 0); } if (result == ISC_R_SUCCESS && - vevent->sigrdataset != NULL) { + vevent->sigrdataset != NULL) + { (void)dns_db_deleterdataset( fctx->cache, node, NULL, dns_rdatatype_rrsig, vevent->type); @@ -5557,7 +5580,8 @@ validated(isc_task_t *task, isc_event_t *event) { vevent->rdataset, 0, NULL); } if (result == ISC_R_SUCCESS && - vevent->sigrdataset != NULL) { + vevent->sigrdataset != NULL) + { (void)dns_db_addrdataset( fctx->cache, node, NULL, now, vevent->sigrdataset, 0, NULL); @@ -5618,7 +5642,8 @@ validated(isc_task_t *task, isc_event_t *event) { * Cache DS NXDOMAIN separately to other types. */ if (message->rcode == dns_rcode_nxdomain && - fctx->type != dns_rdatatype_ds) { + fctx->type != dns_rdatatype_ds) + { covers = dns_rdatatype_any; } else { covers = fctx->type; @@ -5780,7 +5805,8 @@ answer_response: break; } if (sigrdataset == NULL || - sigrdataset->trust != dns_trust_secure) { + sigrdataset->trust != dns_trust_secure) + { continue; } @@ -5808,7 +5834,8 @@ answer_response: * Check SOA and DNSKEY consistency. */ if (rdataset->type == dns_rdatatype_nsec && - !check_soa_and_dnskey(rdataset)) { + !check_soa_and_dnskey(rdataset)) + { continue; } @@ -5816,7 +5843,8 @@ answer_response: * Look for \000 label in next name. */ if (rdataset->type == dns_rdatatype_nsec && - has_000_label(rdataset)) { + has_000_label(rdataset)) + { continue; } @@ -5884,7 +5912,8 @@ answer_response: */ INSIST(hevent->rdataset != NULL); if (dns_rdataset_isassociated(hevent->rdataset) && - NEGATIVE(hevent->rdataset)) { + NEGATIVE(hevent->rdataset)) + { INSIST(eresult == DNS_R_NCACHENXDOMAIN || eresult == DNS_R_NCACHENXRRSET); } @@ -5955,7 +5984,8 @@ findnoqname(fetchctx_t *fctx, dns_message_t *message, dns_name_t *name, sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) { if (sigrdataset->type == dns_rdatatype_rrsig && - sigrdataset->covers == type) { + sigrdataset->covers == type) + { break; } } @@ -6001,7 +6031,8 @@ findnoqname(fetchctx_t *fctx, dns_message_t *message, dns_name_t *name, dns_name_t *nsec = NULL; dns_message_currentname(message, section, &nsec); for (nrdataset = ISC_LIST_HEAD(nsec->list); nrdataset != NULL; - nrdataset = next) { + nrdataset = next) + { bool data = false, exists = false; bool optout = false, unknown = false; bool setclosest = false; @@ -6048,7 +6079,8 @@ findnoqname(fetchctx_t *fctx, dns_message_t *message, dns_name_t *name, sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) { if (sigrdataset->type == dns_rdatatype_rrsig && - sigrdataset->covers == found) { + sigrdataset->covers == found) + { break; } } @@ -6228,7 +6260,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, * query to the domain that owns them.) */ if (secure_domain && rdataset->trust != dns_trust_glue && - !EXTERNAL(rdataset)) { + !EXTERNAL(rdataset)) + { dns_trust_t trust; /* @@ -6240,7 +6273,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, } if (sigrdataset == NULL && need_validation && - !ANSWER(rdataset)) { + !ANSWER(rdataset)) + { /* * Ignore unrelated non-answer * rdatasets that are missing @@ -6286,24 +6320,28 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, if (!need_validation || !ANSWER(rdataset)) { options = 0; if (ANSWER(rdataset) && - rdataset->type != dns_rdatatype_rrsig) { + rdataset->type != dns_rdatatype_rrsig) + { isc_result_t tresult; dns_name_t *noqname = NULL; tresult = findnoqname( fctx, message, name, rdataset->type, &noqname); if (tresult == ISC_R_SUCCESS && - noqname != NULL) { + noqname != NULL) + { (void)dns_rdataset_addnoqname( rdataset, noqname); } } if ((fctx->options & DNS_FETCHOPT_PREFETCH) != - 0) { + 0) + { options = DNS_DBADD_PREFETCH; } if ((fctx->options & DNS_FETCHOPT_NOCACHED) != - 0) { + 0) + { options |= DNS_DBADD_FORCE; } addedrdataset = ardataset; @@ -6314,7 +6352,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, result = ISC_R_SUCCESS; if (!need_validation && ardataset != NULL && - NEGATIVE(ardataset)) { + NEGATIVE(ardataset)) + { /* * The answer in the * cache is better than @@ -6445,7 +6484,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, } if (ANSWER(rdataset) && - rdataset->type != dns_rdatatype_rrsig) { + rdataset->type != dns_rdatatype_rrsig) + { isc_result_t tresult; dns_name_t *noqname = NULL; tresult = findnoqname(fctx, message, name, @@ -6466,7 +6506,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, if (result == DNS_R_UNCHANGED) { if (ANSWER(rdataset) && ardataset != NULL && - NEGATIVE(ardataset)) { + NEGATIVE(ardataset)) + { /* * The answer in the cache is * better than the answer we @@ -6510,7 +6551,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, * event->result. */ if (dns_rdataset_isassociated(event->rdataset) && - NEGATIVE(event->rdataset)) { + NEGATIVE(event->rdataset)) + { INSIST(eresult == DNS_R_NCACHENXDOMAIN || eresult == DNS_R_NCACHENXRRSET); } @@ -6548,7 +6590,8 @@ cache_message(fetchctx_t *fctx, dns_message_t *message, LOCK(&fctx->bucket->lock); for (section = DNS_SECTION_ANSWER; section <= DNS_SECTION_ADDITIONAL; - section++) { + section++) + { result = dns_message_firstname(message, section); while (result == ISC_R_SUCCESS) { name = NULL; @@ -6960,7 +7003,8 @@ check_section(void *arg, const dns_name_t *addname, dns_rdatatype_t type, rtype = rdataset->type; } if (rtype == dns_rdatatype_a || - rtype == dns_rdatatype_aaaa) { + rtype == dns_rdatatype_aaaa) + { mark_related(name, rdataset, external, gluing); } @@ -7416,7 +7460,8 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) { */ dns_rdataset_init(&nameservers); if (dns_rdataset_isassociated( - &fctx->nsfetch->private->nameservers)) { + &fctx->nsfetch->private->nameservers)) + { dns_rdataset_clone(&fctx->nsfetch->private->nameservers, &nameservers); nsrdataset = &nameservers; @@ -7750,7 +7795,8 @@ resquery_response(isc_result_t eresult, isc_region_t *region, void *arg) { if (result != ISC_R_SUCCESS) { FCTXTRACE3("signature check failed", result); if (result == DNS_R_UNEXPECTEDTSIG || - result == DNS_R_EXPECTEDTSIG) { + result == DNS_R_EXPECTEDTSIG) + { rctx.nextitem = true; } rctx_done(&rctx, result); @@ -7806,7 +7852,8 @@ resquery_response(isc_result_t eresult, isc_region_t *region, void *arg) { &required); if (result == ISC_R_SUCCESS && required) { if (isc_log_wouldlog(dns_lctx, - ISC_LOG_INFO)) { + ISC_LOG_INFO)) + { char addrbuf [ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format( @@ -8061,7 +8108,8 @@ rctx_answer_init(respctx_t *rctx) { */ rctx->type = fctx->type; if (rctx->type == dns_rdatatype_rrsig || - rctx->type == dns_rdatatype_sig) { + rctx->type == dns_rdatatype_sig) + { rctx->type = dns_rdatatype_any; } @@ -8643,7 +8691,8 @@ rctx_answer_scan(respctx_t *rctx) { rdataset = ISC_LIST_NEXT(rdataset, link)) { if (rdataset->type == rctx->type || - rctx->type == dns_rdatatype_any) { + rctx->type == dns_rdatatype_any) + { rctx->aname = name; if (rctx->type != dns_rdatatype_any) { rctx->ardataset = rdataset; @@ -8673,7 +8722,8 @@ rctx_answer_scan(respctx_t *rctx) { * and any previously found dname. */ if (nlabels >= rctx->dname_labels || - nlabels < rctx->domain_labels) { + nlabels < rctx->domain_labels) + { continue; } @@ -9248,7 +9298,8 @@ rctx_authority_negative(respctx_t *rctx) { */ if (rdataset->type == dns_rdatatype_ns) { if (rctx->ns_name != NULL && - name != rctx->ns_name) { + name != rctx->ns_name) + { log_formerr(fctx, "multiple NS " "RRsets " "in " @@ -9272,7 +9323,8 @@ rctx_authority_negative(respctx_t *rctx) { */ if (rdataset->type == dns_rdatatype_soa) { if (rctx->soa_name != NULL && - name != rctx->soa_name) { + name != rctx->soa_name) + { log_formerr(fctx, "multiple " "SOA RRs " "in " @@ -9435,7 +9487,8 @@ rctx_authority_dnssec(respctx_t *rctx) { if (rdataset->type == dns_rdatatype_ds) { if (rctx->ds_name != NULL && - name != rctx->ds_name) { + name != rctx->ds_name) + { log_formerr(fctx, "DS doesn't " "match " "referral " @@ -10013,7 +10066,8 @@ rctx_badserver(respctx_t *rctx, isc_result_t result) { * Record that we got a good EDNS response. */ if (query->ednsversion > (int)version && - !EDNSOK(query->addrinfo)) { + !EDNSOK(query->addrinfo)) + { dns_adb_changeflags(fctx->adb, query->addrinfo, FCTX_ADDRINFO_EDNSOK, FCTX_ADDRINFO_EDNSOK); @@ -10902,7 +10956,8 @@ dns_resolver_cancelfetch(dns_fetch_t *fetch) { if (fctx->state != fetchstate_done) { dns_fetchevent_t *next_event = NULL; for (event = ISC_LIST_HEAD(fctx->events); event != NULL; - event = next_event) { + event = next_event) + { next_event = ISC_LIST_NEXT(event, ev_link); if (event->fetch == fetch) { ISC_LIST_UNLINK(fctx->events, event, ev_link); @@ -10951,7 +11006,8 @@ dns_resolver_destroyfetch(dns_fetch_t **fetchp) { if (fctx->state != fetchstate_done) { dns_fetchevent_t *event = NULL, *next_event = NULL; for (event = ISC_LIST_HEAD(fctx->events); event != NULL; - event = next_event) { + event = next_event) + { next_event = ISC_LIST_NEXT(event, ev_link); RUNTIME_CHECK(event->fetch != fetch); } diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c index 627104c7f38..f171a056f70 100644 --- a/lib/dns/rootns.c +++ b/lib/dns/rootns.c @@ -293,7 +293,8 @@ report(dns_view_t *view, dns_name_t *name, bool missing, dns_rdata_t *rdata) { isc_result_t result; if (strcmp(view->name, "_bind") != 0 && - strcmp(view->name, "_default") != 0) { + strcmp(view->name, "_default") != 0) + { viewname = view->name; sep = ": view "; } @@ -470,7 +471,8 @@ dns_root_checkhints(dns_view_t *view, dns_db_t *hints, dns_db_t *db) { isc_stdtime_get(&now); if (strcmp(view->name, "_bind") != 0 && - strcmp(view->name, "_default") != 0) { + strcmp(view->name, "_default") != 0) + { viewname = view->name; sep = ": view "; } diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c index 8992c99cdcf..f575c8cc742 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -926,9 +926,11 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, */ *tgt_prefix = (dns_rpz_prefix_t)prefix_num; for (i = 0; ip_labels > 0 && i < DNS_RPZ_CIDR_WORDS * 2; - ip_labels--) { + ip_labels--) + { if (cp[0] == 'z' && cp[1] == 'z' && - (cp[2] == '.' || cp[2] == '\0') && i <= 6) { + (cp[2] == '.' || cp[2] == '\0') && i <= 6) + { do { if ((i & 1) == 0) { tgt_ip->w[3 - i / 2] = 0; @@ -939,7 +941,8 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, } else { l = strtoul(cp, &cp2, 16); if (l > 0xffffu || - (*cp2 != '.' && *cp2 != '\0')) { + (*cp2 != '.' && *cp2 != '\0')) + { if (*cp2 == '.') { *cp2 = '\0'; } @@ -984,7 +987,8 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, * Complain about bad names but be generous and accept them. */ if (log_level < DNS_RPZ_DEBUG_QUIET && - isc_log_wouldlog(dns_lctx, log_level)) { + isc_log_wouldlog(dns_lctx, log_level)) + { /* * Convert the address back to a canonical domain name * to ensure that the original name is in canonical form. @@ -993,7 +997,8 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, result = ip2name(tgt_ip, (dns_rpz_prefix_t)prefix_num, NULL, ip_name2); if (result != ISC_R_SUCCESS || - !dns_name_equal(&ip_name, ip_name2)) { + !dns_name_equal(&ip_name, ip_name2)) + { char ip2_str[DNS_NAME_FORMATSIZE]; dns_name_format(ip_name2, ip2_str, sizeof(ip2_str)); isc_log_write(dns_lctx, DNS_LOGCATEGORY_RPZ, @@ -2096,7 +2101,8 @@ dns_rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) { */ LOCK(&rpzs->maint_lock); for (dns_rpz_num_t rpz_num = 0; rpz_num < DNS_RPZ_MAX_ZONES; - ++rpz_num) { + ++rpz_num) + { if (rpzs->zones[rpz_num] != NULL) { rpz_detach(&rpzs->zones[rpz_num]); } @@ -2253,7 +2259,8 @@ del_cidr(dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, child = tgt->child[1]; } if (tgt->set.client_ip != 0 || tgt->set.ip != 0 || - tgt->set.nsip != 0) { + tgt->set.nsip != 0) + { break; } diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c index c95e1e6ccdc..ac3f110de50 100644 --- a/lib/dns/rrl.c +++ b/lib/dns/rrl.c @@ -234,7 +234,8 @@ expand_entries(dns_rrl_t *rrl, int newsize) { int i; if (rrl->num_entries + newsize >= rrl->max_entries && - rrl->max_entries != 0) { + rrl->max_entries != 0) + { newsize = rrl->max_entries - rrl->num_entries; if (newsize <= 0) { return (ISC_R_SUCCESS); @@ -372,7 +373,8 @@ ref_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, int probes, isc_stdtime_t now) { rrl->probes += probes; ++rrl->searches; if (rrl->searches > 100 && - delta_rrl_time(rrl->hash->check_time, now) > 1) { + delta_rrl_time(rrl->hash->check_time, now) > 1) + { if (rrl->probes / rrl->searches > 2) { expand_rrl_hash(rrl, now); } @@ -425,7 +427,8 @@ make_key(const dns_rrl_t *rrl, dns_rrl_key_t *key, key->s.qtype = qtype; key->s.qclass = qclass & 0xff; } else if (rtype == DNS_RRL_RTYPE_REFERRAL || - rtype == DNS_RRL_RTYPE_NODATA) { + rtype == DNS_RRL_RTYPE_NODATA) + { /* * Because there is no qtype in the empty answer sections of * referral and NODATA responses, count them as the same. @@ -925,7 +928,8 @@ make_log_buf(dns_rrl_t *rrl, dns_rrl_entry_t *e, const char *str1, { qbuf = get_qname(rrl, e); if (save_qname && qbuf == NULL && qname != NULL && - dns_name_isabsolute(qname)) { + dns_name_isabsolute(qname)) + { /* * Capture the qname for the "stop limiting" message. */ @@ -1010,7 +1014,8 @@ log_stops(dns_rrl_t *rrl, isc_stdtime_t now, int limit, char *log_buf, if (now != 0) { age = get_age(rrl, e, now); if (age < DNS_RRL_STOP_LOG_SECS || - response_balance(rrl, e, age) < 0) { + response_balance(rrl, e, age) < 0) + { break; } } @@ -1082,7 +1087,8 @@ dns_rrl(dns_view_t *view, dns_zone_t *zone, const isc_sockaddr_t *client_addr, qps = (1.0 * rrl->qps_responses) / secs; if (secs >= rrl->window) { if (isc_log_wouldlog(dns_lctx, - DNS_RRL_LOG_DEBUG3)) { + DNS_RRL_LOG_DEBUG3)) + { isc_log_write(dns_lctx, DNS_LOGCATEGORY_RRL, DNS_LOGMODULE_REQUEST, diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c index c5915a7444c..079abbae282 100644 --- a/lib/dns/sdb.c +++ b/lib/dns/sdb.c @@ -448,7 +448,8 @@ getnode(dns_sdballnodes_t *allnodes, const char *name, dns_sdbnode_t **nodep) { dns_name_dup(newname, mctx, sdbnode->name); ISC_LIST_PREPEND(allnodes->nodelist, sdbnode, link); if (allnodes->origin == NULL && - dns_name_equal(newname, &sdb->common.origin)) { + dns_name_equal(newname, &sdb->common.origin)) + { allnodes->origin = sdbnode; } } @@ -937,7 +938,8 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && dns_rdataset_isassociated( - sigrdataset)) { + sigrdataset)) + { dns_rdataset_disassociate( sigrdataset); } @@ -1092,7 +1094,8 @@ createiterator(dns_db_t *db, unsigned int options, } if ((options & DNS_DB_NSEC3ONLY) != 0 || - (options & DNS_DB_NONSEC3) != 0) { + (options & DNS_DB_NONSEC3) != 0) + { return (ISC_R_NOTIMPLEMENTED); } diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c index 26ba3833aa6..1841602a159 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -577,7 +577,8 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, * for wildcards at each level. */ if (result == ISC_R_NOTFOUND && !create && - (options & DNS_DBFIND_NOWILD) == 0) { + (options & DNS_DBFIND_NOWILD) == 0) + { unsigned int i, dlabels, nlabels; nlabels = dns_name_countlabels(name); @@ -751,7 +752,8 @@ createiterator(dns_db_t *db, unsigned int options, } if ((options & DNS_DB_NSEC3ONLY) != 0 || - (options & DNS_DB_NONSEC3) != 0) { + (options & DNS_DB_NONSEC3) != 0) + { return (ISC_R_NOTIMPLEMENTED); } @@ -919,11 +921,13 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, rdataset, sigrdataset); if (result == ISC_R_SUCCESS && i == nlabels && - type == dns_rdatatype_any) { + type == dns_rdatatype_any) + { result = DNS_R_ZONECUT; dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } break; @@ -1917,7 +1921,8 @@ dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name, dns_name_dup(newname, mctx, sdlznode->name); ISC_LIST_PREPEND(allnodes->nodelist, sdlznode, link); if (allnodes->origin == NULL && - dns_name_equal(newname, &sdlz->common.origin)) { + dns_name_equal(newname, &sdlz->common.origin)) + { allnodes->origin = sdlznode; } } diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c index 5f3df90062b..581cdcd82f3 100644 --- a/lib/dns/ssu.c +++ b/lib/dns/ssu.c @@ -317,7 +317,8 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, } if (dns_name_iswildcard(rule->identity)) { if (!dns_name_matcheswildcard(signer, - rule->identity)) { + rule->identity)) + { continue; } } else { @@ -413,25 +414,29 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, break; case dns_ssumatchtype_selfkrb5: if (dst_gssapi_identitymatchesrealmkrb5( - signer, name, rule->identity, false)) { + signer, name, rule->identity, false)) + { break; } continue; case dns_ssumatchtype_selfms: if (dst_gssapi_identitymatchesrealmms( - signer, name, rule->identity, false)) { + signer, name, rule->identity, false)) + { break; } continue; case dns_ssumatchtype_selfsubkrb5: if (dst_gssapi_identitymatchesrealmkrb5( - signer, name, rule->identity, true)) { + signer, name, rule->identity, true)) + { break; } continue; case dns_ssumatchtype_selfsubms: if (dst_gssapi_identitymatchesrealmms( - signer, name, rule->identity, true)) { + signer, name, rule->identity, true)) + { break; } continue; @@ -454,7 +459,8 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, break; } if (dst_gssapi_identitymatchesrealmkrb5( - signer, tname, rule->identity, false)) { + signer, tname, rule->identity, false)) + { break; } continue; @@ -477,7 +483,8 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, break; } if (dst_gssapi_identitymatchesrealmms( - signer, tname, rule->identity, false)) { + signer, tname, rule->identity, false)) + { break; } continue; @@ -486,7 +493,8 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, reverse_from_address(tcpself, addr); if (dns_name_iswildcard(rule->identity)) { if (!dns_name_matcheswildcard(tcpself, - rule->identity)) { + rule->identity)) + { continue; } } else { @@ -503,7 +511,8 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, stf_from_address(stfself, addr); if (dns_name_iswildcard(rule->identity)) { if (!dns_name_matcheswildcard(stfself, - rule->identity)) { + rule->identity)) + { continue; } } else { @@ -525,7 +534,8 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, break; case dns_ssumatchtype_dlz: if (!dns_dlz_ssumatch(table->dlzdatabase, signer, name, - addr, type, key)) { + addr, type, key)) + { continue; } break; @@ -537,13 +547,15 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, * checks will have already checked the type. */ if (rule->matchtype != dns_ssumatchtype_dlz && - !isusertype(type)) { + !isusertype(type)) + { continue; } } else { for (i = 0; i < rule->ntypes; i++) { if (rule->types[i].type == dns_rdatatype_any || - rule->types[i].type == type) { + rule->types[i].type == type) + { break; } } diff --git a/lib/dns/stats.c b/lib/dns/stats.c index a636a445288..c84f830f815 100644 --- a/lib/dns/stats.c +++ b/lib/dns/stats.c @@ -292,7 +292,8 @@ update_rdatasetstats(dns_stats_t *stats, dns_rdatastatstype_t rrsettype, * (active, stale, or ancient) value in the RRtype part. */ if ((DNS_RDATASTATSTYPE_ATTR(rrsettype) & - DNS_RDATASTATSTYPE_ATTR_ANCIENT) != 0) { + DNS_RDATASTATSTYPE_ATTR_ANCIENT) != 0) + { counter |= RDTYPECOUNTER_NXDOMAIN_ANCIENT; } else if ((DNS_RDATASTATSTYPE_ATTR(rrsettype) & DNS_RDATASTATSTYPE_ATTR_STALE) != 0) @@ -303,12 +304,14 @@ update_rdatasetstats(dns_stats_t *stats, dns_rdatastatstype_t rrsettype, counter = rdatatype2counter(DNS_RDATASTATSTYPE_BASE(rrsettype)); if ((DNS_RDATASTATSTYPE_ATTR(rrsettype) & - DNS_RDATASTATSTYPE_ATTR_NXRRSET) != 0) { + DNS_RDATASTATSTYPE_ATTR_NXRRSET) != 0) + { counter |= RDTYPECOUNTER_NXRRSET; } if ((DNS_RDATASTATSTYPE_ATTR(rrsettype) & - DNS_RDATASTATSTYPE_ATTR_ANCIENT) != 0) { + DNS_RDATASTATSTYPE_ATTR_ANCIENT) != 0) + { counter |= RDTYPECOUNTER_ANCIENT; } else if ((DNS_RDATASTATSTYPE_ATTR(rrsettype) & DNS_RDATASTATSTYPE_ATTR_STALE) != 0) @@ -492,10 +495,12 @@ rdataset_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) { * expiry value (active, stale, or ancient). */ if ((counter & RDTYPECOUNTER_MAXTYPE) == - RDTYPECOUNTER_NXDOMAIN_STALE) { + RDTYPECOUNTER_NXDOMAIN_STALE) + { attributes |= DNS_RDATASTATSTYPE_ATTR_STALE; } else if ((counter & RDTYPECOUNTER_MAXTYPE) == - RDTYPECOUNTER_NXDOMAIN_ANCIENT) { + RDTYPECOUNTER_NXDOMAIN_ANCIENT) + { attributes |= DNS_RDATASTATSTYPE_ATTR_ANCIENT; } } else { diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c index 94be0366815..29152663b75 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -750,7 +750,8 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx, result = dns_message_signer(msg, &tsigner); if (result != ISC_R_SUCCESS) { if (tkeyin.mode == DNS_TKEYMODE_GSSAPI && - result == ISC_R_NOTFOUND) { + result == ISC_R_NOTFOUND) + { signer = NULL; } else { tkey_log("dns_tkey_processquery: query was not " diff --git a/lib/dns/transport.c b/lib/dns/transport.c index 33c7ba8afb3..c565b972cae 100644 --- a/lib/dns/transport.c +++ b/lib/dns/transport.c @@ -423,7 +423,8 @@ dns_transport_get_tlsctx(dns_transport_t *transport, const isc_sockaddr_t *peer, } if (dns_transport_get_prefer_server_ciphers( - transport, &prefer_server_ciphers)) { + transport, &prefer_server_ciphers)) + { isc_tlsctx_prefer_server_ciphers(tlsctx, prefer_server_ciphers); } diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index d5ac8cd9bfe..3dca68930bc 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -329,7 +329,8 @@ dns_tsigkey_createfromkey(const dns_name_t *name, const dns_name_t *algorithm, * Ignore this if it's a GSS key, since the key size is meaningless. */ if (dstkey != NULL && dst_key_size(dstkey) < 64 && - dstalg != DST_ALG_GSSAPI) { + dstalg != DST_ALG_GSSAPI) + { char namestr[DNS_NAME_FORMATSIZE]; dns_name_format(name, namestr, sizeof(namestr)); isc_log_write(dns_lctx, DNS_LOGCATEGORY_DNSSEC, @@ -871,7 +872,8 @@ dns_tsig_sign(dns_message_t *msg) { } isc_buffer_putuint16(&databuf, querytsig.siglen); if (isc_buffer_availablelength(&databuf) < - querytsig.siglen) { + querytsig.siglen) + { ret = ISC_R_NOSPACE; goto cleanup_context; } @@ -1197,7 +1199,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, return (DNS_R_FORMERR); } if (tsig.siglen > 0 && - (tsig.siglen < 10 || tsig.siglen < ((siglen + 1) / 2))) { + (tsig.siglen < 10 || tsig.siglen < ((siglen + 1) / 2))) + { tsig_log(msg->tsigkey, 2, "signature length below minimum"); return (DNS_R_FORMERR); @@ -1366,7 +1369,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, uint16_t digestbits = dst_key_getbits(key); if (tsig.siglen > 0 && digestbits != 0 && - tsig.siglen < ((digestbits + 7) / 8)) { + tsig.siglen < ((digestbits + 7) / 8)) + { msg->tsigstatus = dns_tsigerror_badtrunc; tsig_log(msg->tsigkey, 2, "truncated signature length too small"); @@ -1501,7 +1505,8 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { } if (tsig.siglen > 0 && (tsig.siglen < 10 || - tsig.siglen < ((siglen + 1) / 2))) { + tsig.siglen < ((siglen + 1) / 2))) + { tsig_log(tsigkey, 2, "signature length below minimum"); ret = DNS_R_FORMERR; @@ -1673,7 +1678,8 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { uint16_t digestbits = dst_key_getbits(key); if (tsig.siglen > 0 && digestbits != 0 && - tsig.siglen < ((digestbits + 7) / 8)) { + tsig.siglen < ((digestbits + 7) / 8)) + { msg->tsigstatus = dns_tsigerror_badtrunc; tsig_log(msg->tsigkey, 2, "truncated signature length " @@ -1682,7 +1688,8 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { goto cleanup_context; } if (tsig.siglen > 0 && digestbits == 0 && - tsig.siglen < siglen) { + tsig.siglen < siglen) + { msg->tsigstatus = dns_tsigerror_badtrunc; tsig_log(msg->tsigkey, 2, "signature length too small"); diff --git a/lib/dns/update.c b/lib/dns/update.c index 60009cc570a..8420860fdf8 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -1222,7 +1222,8 @@ add_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, continue; } else if (zsk && !dst_key_is_signing(keys[i], DST_BOOL_ZSK, - inception, &when)) { + inception, &when)) + { /* * This key is not active for zone-signing. */ @@ -1337,7 +1338,8 @@ del_keysigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, if (rrsig.keyid == dst_key_id(keys[i])) { found = true; if (!dst_key_isprivate(keys[i]) && - !dst_key_inactive(keys[i])) { + !dst_key_inactive(keys[i])) + { /* * The re-signing code in zone.c * will mark this as offline. @@ -1416,7 +1418,8 @@ add_exposed_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, * as they are handled elsewhere. */ if ((type == dns_rdatatype_rrsig) || - (cut && type != dns_rdatatype_ds)) { + (cut && type != dns_rdatatype_ds)) + { continue; } result = rrset_exists(db, ver, name, dns_rdatatype_rrsig, type, @@ -1694,7 +1697,8 @@ next_state: /* Skip any other updates to the same RRset. */ while (t != NULL && dns_name_equal(&t->name, name) && - t->rdata.type == type) { + t->rdata.type == type) + { next = ISC_LIST_NEXT(t, link); ISC_LIST_UNLINK(diff->tuples, t, link); ISC_LIST_APPEND(state->work.tuples, t, @@ -1816,7 +1820,8 @@ next_state: dns_rdatatype_dname, 0, &dname_exists)); if ((ns_exists || dname_exists) == - (ns_existed || dname_existed)) { + (ns_existed || dname_existed)) + { continue; } /* @@ -2026,7 +2031,8 @@ next_state: bool exists, existed; if (t->rdata.type == dns_rdatatype_nsec || - t->rdata.type == dns_rdatatype_rrsig) { + t->rdata.type == dns_rdatatype_rrsig) + { t = ISC_LIST_NEXT(t, link); continue; } diff --git a/lib/dns/validator.c b/lib/dns/validator.c index ca5000da77f..73c667d63fd 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -425,7 +425,8 @@ fetch_callback_dnskey(isc_task_t *task, isc_event_t *event) { * Only extract the dst key if the keyset exists and is secure. */ if (eresult == ISC_R_SUCCESS && - rdataset->trust >= dns_trust_secure) { + rdataset->trust >= dns_trust_secure) + { result = select_signing_key(val, rdataset); if (result == ISC_R_SUCCESS) { val->keyset = &val->frdataset; @@ -433,7 +434,8 @@ fetch_callback_dnskey(isc_task_t *task, isc_event_t *event) { } result = validate_answer(val, true); if (result == DNS_R_NOVALIDSIG && - (val->attributes & VALATTR_TRIEDVERIFY) == 0) { + (val->attributes & VALATTR_TRIEDVERIFY) == 0) + { saved_result = result; validator_log(val, ISC_LOG_DEBUG(3), "falling back to insecurity proof"); @@ -668,7 +670,8 @@ validator_callback_dnskey(isc_task_t *task, isc_event_t *event) { } result = validate_answer(val, true); if (result == DNS_R_NOVALIDSIG && - (val->attributes & VALATTR_TRIEDVERIFY) == 0) { + (val->attributes & VALATTR_TRIEDVERIFY) == 0) + { saved_result = result; validator_log(val, ISC_LOG_DEBUG(3), "falling back to insecurity proof"); @@ -906,7 +909,8 @@ validator_callback_nsec(isc_task_t *task, isc_event_t *event) { * the wildcard used to generate the response. */ if (clabels == 0 || - dns_name_countlabels(wild) == clabels + 1) { + dns_name_countlabels(wild) == clabels + 1) + { val->attributes |= VALATTR_FOUNDCLOSEST; } /* @@ -1190,7 +1194,8 @@ seek_dnskey(dns_validator_t *val) { namereln = dns_name_fullcompare(val->event->name, &siginfo->signer, &order, &nlabels); if (namereln != dns_namereln_subdomain && - namereln != dns_namereln_equal) { + namereln != dns_namereln_equal) + { return (DNS_R_CONTINUE); } @@ -1516,7 +1521,8 @@ validate_answer(dns_validator_t *val, bool resume) { } for (; result == ISC_R_SUCCESS; - result = dns_rdataset_next(event->sigrdataset)) { + result = dns_rdataset_next(event->sigrdataset)) + { dns_rdata_reset(&rdata); dns_rdataset_current(event->sigrdataset, &rdata); if (val->siginfo == NULL) { @@ -2076,7 +2082,8 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type, result = val_rdataset_next(val, &name, &rdataset)) { if (rdataset->type != type || - rdataset->trust != dns_trust_secure) { + rdataset->trust != dns_trust_secure) + { continue; } @@ -2253,16 +2260,19 @@ findnsec3proofs(dns_validator_t *val) { * which proof. Just populate them. */ if (NEEDNOQNAME(val) && - proofs[DNS_VALIDATOR_NOQNAMEPROOF] == NULL) { + proofs[DNS_VALIDATOR_NOQNAMEPROOF] == NULL) + { proofs[DNS_VALIDATOR_NOQNAMEPROOF] = name; } else if (setclosest) { proofs[DNS_VALIDATOR_CLOSESTENCLOSER] = name; } else if (NEEDNODATA(val) && - proofs[DNS_VALIDATOR_NODATAPROOF] == NULL) { + proofs[DNS_VALIDATOR_NODATAPROOF] == NULL) + { proofs[DNS_VALIDATOR_NODATAPROOF] = name; } else if (NEEDNOWILDCARD(val) && proofs[DNS_VALIDATOR_NOWILDCARDPROOF] == - NULL) { + NULL) + { proofs[DNS_VALIDATOR_NOWILDCARDPROOF] = name; } return (result); @@ -2407,7 +2417,8 @@ validate_authority(dns_validator_t *val, bool resume) { } for (; rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type == dns_rdatatype_rrsig) { continue; } @@ -3025,7 +3036,8 @@ validator_start(isc_task_t *task, isc_event_t *event) { result = validate_answer(val, false); } if (result == DNS_R_NOVALIDSIG && - (val->attributes & VALATTR_TRIEDVERIFY) == 0) { + (val->attributes & VALATTR_TRIEDVERIFY) == 0) + { saved_result = result; validator_log(val, ISC_LOG_DEBUG(3), "falling back to insecurity proof"); @@ -3035,7 +3047,8 @@ validator_start(isc_task_t *task, isc_event_t *event) { } } } else if (val->event->rdataset != NULL && - val->event->rdataset->type != 0) { + val->event->rdataset->type != 0) + { /* * This is either an unsecure subdomain or a response * from a broken server. @@ -3051,7 +3064,8 @@ validator_start(isc_task_t *task, isc_event_t *event) { "parent indicates it should be secure"); } } else if ((val->event->rdataset == NULL && - val->event->sigrdataset == NULL)) { + val->event->sigrdataset == NULL)) + { /* * This is a validation of a negative response. */ @@ -3068,7 +3082,8 @@ validator_start(isc_task_t *task, isc_event_t *event) { result = validate_nx(val, false); } else if ((val->event->rdataset != NULL && - NEGATIVE(val->event->rdataset))) { + NEGATIVE(val->event->rdataset))) + { /* * This is a delayed validation of a negative cache entry. */ diff --git a/lib/dns/view.c b/lib/dns/view.c index 43bdfc6fe71..a4229d9e5f5 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -944,7 +944,8 @@ db_find: dns_rdataset_disassociate(rdataset); } if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } if (node != NULL) { @@ -972,7 +973,8 @@ db_find: if (dns_rdataset_isassociated(&zrdataset)) { dns_rdataset_clone(&zrdataset, rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(&zsigrdataset)) { + dns_rdataset_isassociated(&zsigrdataset)) + { dns_rdataset_clone(&zsigrdataset, sigrdataset); } @@ -999,7 +1001,8 @@ db_find: dns_rdataset_clone(rdataset, &zrdataset); dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_clone(sigrdataset, &zsigrdataset); dns_rdataset_disassociate(sigrdataset); } @@ -1021,7 +1024,8 @@ db_find: dns_rdataset_disassociate(rdataset); } if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } if (db != NULL) { @@ -1123,7 +1127,8 @@ dns_view_simplefind(dns_view_t *view, const dns_name_t *name, dns_rdataset_disassociate(rdataset); } if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } } else if (result != ISC_R_SUCCESS && result != DNS_R_GLUE && @@ -1135,7 +1140,8 @@ dns_view_simplefind(dns_view_t *view, const dns_name_t *name, dns_rdataset_disassociate(rdataset); } if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } result = ISC_R_NOTFOUND; @@ -1242,7 +1248,8 @@ db_find: dns_rdataset_clone(rdataset, &zrdataset); dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_clone(sigrdataset, &zsigrdataset); dns_rdataset_disassociate(sigrdataset); } @@ -1296,7 +1303,8 @@ finish: if (dns_rdataset_isassociated(rdataset)) { dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } } @@ -1306,7 +1314,8 @@ finish: } dns_rdataset_clone(&zrdataset, rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(&zrdataset)) { + dns_rdataset_isassociated(&zrdataset)) + { dns_rdataset_clone(&zsigrdataset, sigrdataset); } } else if (try_hints) { @@ -2234,7 +2243,8 @@ dns_view_loadnta(dns_view_t *view) { CHECK(isc_lex_gettoken(lex, options, &token)); if (token.type != isc_tokentype_eol && - token.type != isc_tokentype_eof) { + token.type != isc_tokentype_eof) + { CHECK(ISC_R_UNEXPECTEDTOKEN); } diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index 91dd4993c9c..fdf2d03f506 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -500,7 +500,8 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, uint32_t ttl, xfr->nrecs++; if (rdata->type == dns_rdatatype_none || - dns_rdatatype_ismeta(rdata->type)) { + dns_rdatatype_ismeta(rdata->type)) + { FAIL(DNS_R_FORMERR); } @@ -510,7 +511,8 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, uint32_t ttl, * apex. */ if (rdata->type == dns_rdatatype_soa && - !dns_name_equal(&xfr->name, name)) { + !dns_name_equal(&xfr->name, name)) + { char namebuf[DNS_NAME_FORMATSIZE]; dns_name_format(name, namebuf, sizeof(namebuf)); xfrin_log(xfr, ISC_LOG_DEBUG(3), "SOA name mismatch: '%s'", @@ -644,7 +646,8 @@ redo: } } if (rdata->type == dns_rdatatype_ns && - dns_name_iswildcard(name)) { + dns_name_iswildcard(name)) + { FAIL(DNS_R_INVALIDNS); } CHECK(ixfr_putdata(xfr, DNS_DIFFOP_ADD, name, ttl, rdata)); @@ -830,7 +833,8 @@ static void xfrin_fail(dns_xfrin_ctx_t *xfr, isc_result_t result, const char *msg) { /* Make sure only the first xfrin_fail() trumps */ if (atomic_compare_exchange_strong(&xfr->shuttingdown, &(bool){ false }, - true)) { + true)) + { if (result != DNS_R_UPTODATE && result != DNS_R_TOOMANYRECORDS) { xfrin_log(xfr, ISC_LOG_ERROR, "%s: %s", msg, @@ -1280,17 +1284,20 @@ xfrin_recv_done(isc_nmhandle_t *handle, isc_result_t result, { result = dns_result_fromrcode(msg->rcode); } else if (result == ISC_R_SUCCESS && - msg->opcode != dns_opcode_query) { + msg->opcode != dns_opcode_query) + { result = DNS_R_UNEXPECTEDOPCODE; } else if (result == ISC_R_SUCCESS && - msg->rdclass != xfr->rdclass) { + msg->rdclass != xfr->rdclass) + { result = DNS_R_BADCLASS; } else if (result == ISC_R_SUCCESS || result == DNS_R_NOERROR) { result = DNS_R_UNEXPECTEDID; } if (xfr->reqtype == dns_rdatatype_axfr || - xfr->reqtype == dns_rdatatype_soa) { + xfr->reqtype == dns_rdatatype_soa) + { goto failure; } @@ -1381,7 +1388,8 @@ xfrin_recv_done(isc_nmhandle_t *handle, isc_result_t result, } if (xfr->reqtype == dns_rdatatype_soa && - (msg->flags & DNS_MESSAGEFLAG_AA) == 0) { + (msg->flags & DNS_MESSAGEFLAG_AA) == 0) + { FAIL(DNS_R_NOTAUTHORITATIVE); } diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 04187e366e2..fb638083001 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -2081,7 +2081,8 @@ zone_touched(dns_zone_t *zone) { result = isc_file_getmodtime(zone->masterfile, &modtime); if (result != ISC_R_SUCCESS || - isc_time_compare(&modtime, &zone->loadtime) > 0) { + isc_time_compare(&modtime, &zone->loadtime) > 0) + { return (true); } @@ -2220,7 +2221,8 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) { } if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) && - !zone_touched(zone)) { + !zone_touched(zone)) + { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_DEBUG(1), "skipping load: master file " @@ -2235,7 +2237,8 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) { */ result = isc_file_getmodtime(zone->masterfile, &filetime); if (result == ISC_R_SUCCESS && - isc_time_compare(&loadtime, &filetime) > 0) { + isc_time_compare(&loadtime, &filetime) > 0) + { loadtime = filetime; } } @@ -3572,7 +3575,8 @@ zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) { * fermat number). */ if (dnskey.datalen > 1 && dnskey.data[0] == 1 && - dnskey.data[1] == 3) { + dnskey.data[1] == 3) + { const char *algorithm = ""; isc_region_t r; bool logit = true; @@ -3658,7 +3662,8 @@ resume_signingwithkey(dns_zone_t *zone) { { dns_rdataset_current(&rdataset, &rdata); if (rdata.length != 5 || rdata.data[0] == 0 || - rdata.data[4] != 0) { + rdata.data[4] != 0) + { dns_rdata_reset(&rdata); continue; } @@ -3942,7 +3947,8 @@ resume_addnsec3chain(dns_zone_t *zone) { * represent an NSEC3PARAM record, so skip it. */ if (!dns_nsec3param_fromprivate(&private, &rdata, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } result = dns_rdata_tostruct(&rdata, &nsec3param, NULL); @@ -4949,7 +4955,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, } else { int level = ISC_LOG_ERROR; if (zone->type == dns_zone_key && - result == ISC_R_FILENOTFOUND) { + result == ISC_R_FILENOTFOUND) + { level = ISC_LOG_DEBUG(1); } dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, level, @@ -5111,7 +5118,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, goto cleanup; } if (zone->type != dns_zone_stub && - zone->type != dns_zone_redirect) { + zone->type != dns_zone_redirect) + { result = check_nsec3param(zone, db); if (result != ISC_R_SUCCESS) { goto cleanup; @@ -5168,7 +5176,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, INSIST(zone->raw == NULL); if (serial == oldserial && - zone_unchanged(zone->db, db, zone->mctx)) { + zone_unchanged(zone->db, db, zone->mctx)) + { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_INFO, @@ -5253,7 +5262,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, isc_random_uniform((zone->retry * 3) / 4)); DNS_ZONE_TIME_ADD(&now, delay, &zone->refreshtime); if (isc_time_compare(&zone->refreshtime, - &zone->expiretime) >= 0) { + &zone->expiretime) >= 0) + { zone->refreshtime = now; } } @@ -5303,7 +5313,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_LOADED | DNS_ZONEFLG_NEEDSTARTUPNOTIFY); if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_SENDSECURE) && - inline_raw(zone)) { + inline_raw(zone)) + { if (zone->secure->db == NULL) { zone_send_securedb(zone, db); } else { @@ -5456,7 +5467,8 @@ cleanup: } result = ISC_R_SUCCESS; } else if (zone->type == dns_zone_primary || - zone->type == dns_zone_redirect) { + zone->type == dns_zone_redirect) + { if (!(inline_secure(zone) && result == ISC_R_FILENOTFOUND)) { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_ERROR, @@ -6711,12 +6723,14 @@ dns_zone_getdnsseckeys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, /* Add new 'dnskeys' to 'keys'. */ for (dns_dnsseckey_t *k1 = ISC_LIST_HEAD(dnskeys); k1 != NULL; - k1 = key_next) { + k1 = key_next) + { dns_dnsseckey_t *k2 = NULL; key_next = ISC_LIST_NEXT(k1, link); for (k2 = ISC_LIST_HEAD(*keys); k2 != NULL; - k2 = ISC_LIST_NEXT(k2, link)) { + k2 = ISC_LIST_NEXT(k2, link)) + { if (dst_key_compare(k1->key, k2->key)) { break; } @@ -7013,16 +7027,19 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, * iff there is a new offline signature. */ if (!dst_key_inactive(keys[i]) && - !dst_key_isprivate(keys[i])) { + !dst_key_isprivate(keys[i])) + { int64_t timeexpire = dns_time64_from32( rrsig.timeexpire); if (timewarn != 0 && - timewarn > timeexpire) { + timewarn > timeexpire) + { timewarn = timeexpire; } if (rdata.flags & DNS_RDATA_OFFLINE) { if (timemaybe == 0 || - timemaybe > timeexpire) { + timemaybe > timeexpire) + { timemaybe = timeexpire; } break; @@ -7031,7 +7048,8 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, timewarn = timemaybe; } if (timewarn == 0 || - timewarn > timeexpire) { + timewarn > timeexpire) + { timewarn = timeexpire; } result = offline(db, ver, zonediff, @@ -7270,14 +7288,16 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_zone_t *zone, * Other RRsets are signed with ZSK. */ if (type != dns_rdatatype_soa && - type != zone->privatetype) { + type != zone->privatetype) + { continue; } if (have_zsk) { continue; } } else if (!dst_key_is_signing(keys[i], DST_BOOL_ZSK, - inception, &when)) { + inception, &when)) + { /* * This key is not active for zone-signing. */ @@ -7377,7 +7397,8 @@ zone_resigninc(dns_zone_t *zone) { * Pause for 5 minutes. */ if (zone->update_disabled || - DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_NORESIGN)) { + DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_NORESIGN)) + { result = ISC_R_FAILURE; goto failure; } @@ -7663,7 +7684,8 @@ signed_with_good_key(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, result = dns_rdata_tostruct(&rdata, &rrsig, NULL); INSIST(result == ISC_R_SUCCESS); if (rrsig.algorithm == dst_key_alg(key) && - rrsig.keyid == dst_key_id(key)) { + rrsig.keyid == dst_key_id(key)) + { dns_rdataset_disassociate(&rdataset); return (true); } @@ -7864,7 +7886,8 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name, dns_rdatasetiter_current(iterator, &rdataset); if (rdataset.type == dns_rdatatype_soa || - rdataset.type == dns_rdatatype_rrsig) { + rdataset.type == dns_rdatatype_rrsig) + { goto next_rdataset; } if (rdataset.type == dns_rdatatype_dnskey || @@ -7883,7 +7906,8 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name, } else if (!is_zsk) { goto next_rdataset; } else if (is_zsk && !dst_key_is_signing(key, DST_BOOL_ZSK, - inception, &when)) { + inception, &when)) + { /* Only applies to dnssec-policy. */ if (dns_zone_getkasp(zone) != NULL) { goto next_rdataset; @@ -7896,7 +7920,8 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name, goto next_rdataset; } if (signed_with_good_key(zone, db, node, version, rdataset.type, - key)) { + key)) + { goto next_rdataset; } @@ -8219,7 +8244,8 @@ try_private: dns_rdataset_current(&rdataset, &private); if (!dns_nsec3param_fromprivate(&private, &rdata, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } CHECK(dns_rdata_tostruct(&rdata, &nsec3param, NULL)); @@ -9476,7 +9502,8 @@ del_sig(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, dns_rdataset_current(&rdataset, &rdata); CHECK(dns_rdata_tostruct(&rdata, &rrsig, NULL)); if (nkeys != 0 && (rrsig.algorithm != algorithm || - rrsig.keyid != keyid)) { + rrsig.keyid != keyid)) + { if (rrsig.algorithm == algorithm) { has_alg = true; } @@ -9901,7 +9928,8 @@ zone_sign(dns_zone_t *zone) { * with the algorithm that was being removed. */ if (signing->deleteit && - ALG(zone_keys[i]) != signing->algorithm) { + ALG(zone_keys[i]) != signing->algorithm) + { continue; } @@ -9919,7 +9947,8 @@ zone_sign(dns_zone_t *zone) { } for (j = 0; j < nkeys; j++) { if (j == i || (ALG(zone_keys[i]) != - ALG(zone_keys[j]))) { + ALG(zone_keys[j]))) + { continue; } /* @@ -9937,7 +9966,8 @@ zone_sign(dns_zone_t *zone) { if (KSK(zone_keys[j])) { have_ksk = true; } else if (dst_key_isprivate( - zone_keys[j])) { + zone_keys[j])) + { have_nonksk = true; } both = have_ksk && have_nonksk; @@ -10503,7 +10533,8 @@ revocable(dns_keyfetch_t *kfetch, dns_rdata_keydata_t *keydata) { RUNTIME_CHECK(result == ISC_R_SUCCESS); if (dst_key_alg(dstkey) == sig.algorithm && - dst_key_rid(dstkey) == sig.keyid) { + dst_key_rid(dstkey) == sig.keyid) + { result = dns_dnssec_verify( keyname, &kfetch->dnskeyset, dstkey, false, 0, mctx, &sigrr, dns_fixedname_name(&fixed)); @@ -10672,7 +10703,8 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) { RUNTIME_CHECK(tresult == ISC_R_SUCCESS); if (ds.key_tag != sig.keyid || - ds.algorithm != sig.algorithm) { + ds.algorithm != sig.algorithm) + { continue; } @@ -10785,7 +10817,8 @@ anchors_done: if (!secure) { if (keydata.removehd != 0 && - keydata.removehd <= now) { + keydata.removehd <= now) + { deletekey = true; } } else if (keydata.addhd == 0) { @@ -11988,7 +12021,8 @@ dns_zone_flush(dns_zone_t *zone) { LOCK_ZONE(zone); DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_FLUSH); if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) && - zone->masterfile != NULL) { + zone->masterfile != NULL) + { DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NEEDCOMPACT); result = ISC_R_ALREADYRUNNING; dumping = was_dumping(zone); @@ -12035,7 +12069,8 @@ zone_needdump(dns_zone_t *zone, unsigned int delay) { * Do we have a place to dump to and are we loaded? */ if (zone->masterfile == NULL || - DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) == 0) { + DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) == 0) + { return; } @@ -12107,7 +12142,8 @@ dump_done(void *arg, isc_result_t result) { mresult = dns_db_getsoaserial(zone->secure->db, NULL, &sserial); if (mresult == ISC_R_SUCCESS && - isc_serial_lt(sserial, serial)) { + isc_serial_lt(sserial, serial)) + { serial = sserial; } } @@ -12911,7 +12947,8 @@ notify_send(dns_notify_t *notify) { { dst = ai->sockaddr; if (notify_isqueued(notify->zone, notify->flags, NULL, &dst, - NULL, NULL)) { + NULL, NULL)) + { continue; } if (notify_isself(notify->zone, &dst)) { @@ -12997,7 +13034,8 @@ zone_notify(dns_zone_t *zone, isc_time_t *now) { } if (notifytype == dns_notifytype_masteronly && - zone->type != dns_zone_primary) { + zone->type != dns_zone_primary) + { return; } @@ -13069,13 +13107,15 @@ zone_notify(dns_zone_t *zone, isc_time_t *now) { dns_view_t *view = dns_zone_getview(zone); if ((zone->notifykeynames != NULL) && - (zone->notifykeynames[i] != NULL)) { + (zone->notifykeynames[i] != NULL)) + { dns_name_t *keyname = zone->notifykeynames[i]; (void)dns_view_gettsig(view, keyname, &key); } if ((zone->notifytlsnames != NULL) && - (zone->notifytlsnames[i] != NULL)) { + (zone->notifytlsnames[i] != NULL)) + { dns_name_t *tlsname = zone->notifytlsnames[i]; (void)dns_view_gettransport(view, DNS_TRANSPORT_TLS, tlsname, &transport); @@ -14267,7 +14307,8 @@ refresh_callback(isc_task_t *task, isc_event_t *event) { goto same_primary; } if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOEDNS) && - msg->rcode == dns_rcode_badvers) { + msg->rcode == dns_rcode_badvers) + { dns_zone_log(zone, ISC_LOG_DEBUG(1), "refresh: rcode (%.*s) retrying without " "EDNS EXPIRE OPTION primary %s " @@ -14742,7 +14783,8 @@ again: case PF_INET: if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEALTXFRSRC)) { if (isc_sockaddr_equal(&zone->altxfrsource4, - &zone->xfrsource4)) { + &zone->xfrsource4)) + { goto skip_primary; } zone->sourceaddr = zone->altxfrsource4; @@ -14759,7 +14801,8 @@ again: case PF_INET6: if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEALTXFRSRC)) { if (isc_sockaddr_equal(&zone->altxfrsource6, - &zone->xfrsource6)) { + &zone->xfrsource6)) + { goto skip_primary; } zone->sourceaddr = zone->altxfrsource6; @@ -15318,7 +15361,8 @@ zone__settimer(void *arg) { { INSIST(!isc_time_isepoch(&zone->dumptime)); if (isc_time_isepoch(&next) || - isc_time_compare(&zone->dumptime, &next) < 0) { + isc_time_compare(&zone->dumptime, &next) < 0) + { next = zone->dumptime; } } @@ -15336,19 +15380,22 @@ zone__settimer(void *arg) { } if (!isc_time_isepoch(&zone->resigntime)) { if (isc_time_isepoch(&next) || - isc_time_compare(&zone->resigntime, &next) < 0) { + isc_time_compare(&zone->resigntime, &next) < 0) + { next = zone->resigntime; } } if (!isc_time_isepoch(&zone->keywarntime)) { if (isc_time_isepoch(&next) || - isc_time_compare(&zone->keywarntime, &next) < 0) { + isc_time_compare(&zone->keywarntime, &next) < 0) + { next = zone->keywarntime; } } if (!isc_time_isepoch(&zone->signingtime)) { if (isc_time_isepoch(&next) || - isc_time_compare(&zone->signingtime, &next) < 0) { + isc_time_compare(&zone->signingtime, &next) < 0) + { next = zone->signingtime; } } @@ -15386,7 +15433,8 @@ zone__settimer(void *arg) { !isc_time_isepoch(&zone->expiretime)) { if (isc_time_isepoch(&next) || - isc_time_compare(&zone->expiretime, &next) < 0) { + isc_time_compare(&zone->expiretime, &next) < 0) + { next = zone->expiretime; } } @@ -15395,7 +15443,8 @@ zone__settimer(void *arg) { { INSIST(!isc_time_isepoch(&zone->dumptime)); if (isc_time_isepoch(&next) || - isc_time_compare(&zone->dumptime, &next) < 0) { + isc_time_compare(&zone->dumptime, &next) < 0) + { next = zone->dumptime; } } @@ -15407,7 +15456,8 @@ zone__settimer(void *arg) { { INSIST(!isc_time_isepoch(&zone->dumptime)); if (isc_time_isepoch(&next) || - isc_time_compare(&zone->dumptime, &next) < 0) { + isc_time_compare(&zone->dumptime, &next) < 0) + { next = zone->dumptime; } } @@ -16143,7 +16193,8 @@ zone_viewname_tostr(dns_zone_t *zone, char *buf, size_t length) { if (zone->view == NULL) { isc_buffer_putstr(&buffer, "_none"); } else if (strlen(zone->view->name) < - isc_buffer_availablelength(&buffer)) { + isc_buffer_availablelength(&buffer)) + { isc_buffer_putstr(&buffer, zone->view->name); } else { isc_buffer_putstr(&buffer, "_toolong"); @@ -17064,7 +17115,8 @@ getprivate: * Do we have a valid private record? */ if (!dns_nsec3param_fromprivate(&private, &rdata, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } @@ -17078,7 +17130,8 @@ getprivate: rdata.data[1] = 0; for (nsec3p = ISC_LIST_HEAD(*nsec3list); nsec3p != NULL; - nsec3p = next) { + nsec3p = next) + { next = ISC_LIST_NEXT(nsec3p, link); if (nsec3p->length == rdata.length + 1 && @@ -17905,7 +17958,8 @@ again: * Let any other zones waiting for quota have it. */ if (zone->zmgr != NULL && - zone->statelist == &zone->zmgr->xfrin_in_progress) { + zone->statelist == &zone->zmgr->xfrin_in_progress) + { UNLOCK_ZONE(zone); RWLOCK(&zone->zmgr->rwlock, isc_rwlocktype_write); ISC_LIST_UNLINK(zone->zmgr->xfrin_in_progress, zone, statelink); @@ -18686,7 +18740,8 @@ zonemgr_keymgmt_destroy(dns_zonemgr_t *zmgr) { RWLOCK(&mgmt->lock, isc_rwlocktype_write); size = ISC_HASHSIZE(mgmt->bits); for (unsigned int i = 0; - atomic_load_relaxed(&mgmt->count) > 0 && i < size; i++) { + atomic_load_relaxed(&mgmt->count) > 0 && i < size; i++) + { for (curr = mgmt->table[i]; curr != NULL; curr = next) { next = curr->next; isc_mutex_destroy(&curr->lock); @@ -19328,7 +19383,8 @@ zmgr_resume_xfrs(dns_zonemgr_t *zmgr, bool multi) { dns_zone_t *next; for (zone = ISC_LIST_HEAD(zmgr->waiting_for_xfrin); zone != NULL; - zone = next) { + zone = next) + { isc_result_t result; next = ISC_LIST_NEXT(zone, statelink); result = zmgr_start_xfrin_ifquota(zmgr, zone); @@ -20395,7 +20451,8 @@ next_keyevent(dst_key_t *key, isc_stdtime_t *timep) { for (i = 0; i <= DST_MAX_TIMES; i++) { result = dst_key_gettime(key, i, &event); if (result == ISC_R_SUCCESS && event > now && - (then == 0 || event < then)) { + (then == 0 || event < then)) + { then = event; } } @@ -20546,7 +20603,8 @@ tickle_apex_rrset(dns_rdatatype_t rrtype, dns_zone_t *zone, dns_db_t *db, tuple = ISC_LIST_NEXT(tuple, link)) { if (tuple->rdata.type == rrtype && - dns_name_equal(&tuple->name, &zone->origin)) { + dns_name_equal(&tuple->name, &zone->origin)) + { break; } } @@ -20998,7 +21056,8 @@ checkds_done(isc_task_t *task, isc_event_t *event) { if (ds_state == DST_KEY_STATE_RUMOURED && published == 0) { checkdspub = true; } else if (ds_state == DST_KEY_STATE_UNRETENTIVE && - withdrawn == 0) { + withdrawn == 0) + { checkdsdel = true; } if (!checkdspub && !checkdsdel) { @@ -21373,13 +21432,15 @@ checkds_send(dns_zone_t *zone) { dns_checkds_t *checkds = NULL; if ((zone->parentalkeynames != NULL) && - (zone->parentalkeynames[i] != NULL)) { + (zone->parentalkeynames[i] != NULL)) + { dns_name_t *keyname = zone->parentalkeynames[i]; (void)dns_view_gettsig(view, keyname, &key); } if ((zone->parentaltlsnames != NULL) && - (zone->parentaltlsnames[i] != NULL)) { + (zone->parentaltlsnames[i] != NULL)) + { dns_name_t *tlsname = zone->parentaltlsnames[i]; (void)dns_view_gettransport(view, DNS_TRANSPORT_TLS, tlsname, &transport); @@ -21472,7 +21533,8 @@ zone_checkds(dns_zone_t *zone) { dst_key_setnum(key->key, DST_NUM_DSPUBCOUNT, 0); cdscheck = true; } else if (ds_state == DST_KEY_STATE_UNRETENTIVE && - withdrawn == 0) { + withdrawn == 0) + { dst_key_setnum(key->key, DST_NUM_DSDELCOUNT, 0); cdscheck = true; } @@ -21751,7 +21813,8 @@ zone_rekey(dns_zone_t *zone) { */ bool allow = false; for (key = ISC_LIST_HEAD(dnskeys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { dst_key_t *dstk = key->key; if (dst_key_is_published(dstk, now, &when) && @@ -21788,7 +21851,8 @@ zone_rekey(dns_zone_t *zone) { * the zone signing can be handled incrementally.) */ for (key = ISC_LIST_HEAD(dnskeys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { if (!key->first_sign) { continue; } @@ -21860,7 +21924,8 @@ zone_rekey(dns_zone_t *zone) { /* Remove any signatures from removed keys. */ if (!ISC_LIST_EMPTY(rmkeys)) { for (key = ISC_LIST_HEAD(rmkeys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { result = zone_signwithkey( zone, dst_key_alg(key->key), dst_key_id(key->key), true); @@ -21895,7 +21960,8 @@ zone_rekey(dns_zone_t *zone) { * with all active keys, whether they're new or not. */ for (key = ISC_LIST_HEAD(dnskeys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { if (!key->force_sign && !key->hint_sign) { continue; } @@ -21918,7 +21984,8 @@ zone_rekey(dns_zone_t *zone) { * keys. */ for (key = ISC_LIST_HEAD(dnskeys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { if (!key->first_sign) { continue; } @@ -21953,12 +22020,14 @@ zone_rekey(dns_zone_t *zone) { dns_rdata_nsec3param_t nsec3param; if (tuple->rdata.type != zone->privatetype || - tuple->op != DNS_DIFFOP_ADD) { + tuple->op != DNS_DIFFOP_ADD) + { continue; } if (!dns_nsec3param_fromprivate(&tuple->rdata, &rdata, - buf, sizeof(buf))) { + buf, sizeof(buf))) + { continue; } @@ -22034,7 +22103,8 @@ zone_rekey(dns_zone_t *zone) { zone->refreshkeytime = timethen; for (key = ISC_LIST_HEAD(dnskeys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { then = now; result = next_keyevent(key->key, &then); if (result != ISC_R_SUCCESS) { @@ -22043,7 +22113,8 @@ zone_rekey(dns_zone_t *zone) { DNS_ZONE_TIME_ADD(&timenow, then - now, &timethen); if (isc_time_compare(&timethen, &zone->refreshkeytime) < - 0) { + 0) + { zone->refreshkeytime = timethen; } } @@ -22057,7 +22128,8 @@ zone_rekey(dns_zone_t *zone) { if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3))) { for (key = ISC_LIST_HEAD(dnskeys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { /* This debug log is used in the kasp system test */ char algbuf[DNS_SECALG_FORMATSIZE]; dns_secalg_format(dst_key_alg(key->key), algbuf, @@ -22194,7 +22266,8 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) { } if (!dns_rdataset_isassociated(&cds) && - !dns_rdataset_isassociated(&cdnskey)) { + !dns_rdataset_isassociated(&cdnskey)) + { result = ISC_R_SUCCESS; goto failure; } @@ -22255,7 +22328,8 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) { NULL)); if (structdnskey.algorithm == - structcds.algorithm) { + structcds.algorithm) + { algorithms[structcds.algorithm] = found; } } @@ -22327,7 +22401,8 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) { NULL)); if (structdnskey.algorithm == - structcdnskey.algorithm) { + structcdnskey.algorithm) + { algorithms[structcdnskey.algorithm] = found; } @@ -22637,12 +22712,14 @@ keydone(isc_task_t *task, isc_event_t *event) { { found = true; } else if (rdata.data[0] == 0 && - (rdata.data[2] & PENDINGFLAGS) != 0) { + (rdata.data[2] & PENDINGFLAGS) != 0) + { found = true; clear_pending = true; } } else if (rdata.length == 5 && - memcmp(rdata.data, kd->data, 5) == 0) { + memcmp(rdata.data, kd->data, 5) == 0) + { found = true; } @@ -22946,7 +23023,8 @@ rss_post(dns_zone_t *zone, isc_event_t *event) { dns_rdataset_current(&prdataset, &rdata); if (np->length == rdata.length && - memcmp(rdata.data, np->data, np->length) == 0) { + memcmp(rdata.data, np->data, np->length) == 0) + { exists = true; break; } @@ -23154,7 +23232,8 @@ dns__zone_lookup_nsec3param(dns_zone_t *zone, dns_rdata_nsec3param_t *lookup, } if (lookup->salt != NULL) { if (memcmp(nsec3param.salt, lookup->salt, - lookup->salt_length) != 0) { + lookup->salt_length) != 0) + { continue; } } diff --git a/lib/dns/zonekey.c b/lib/dns/zonekey.c index 00821be6ce2..f86c2ca9f2a 100644 --- a/lib/dns/zonekey.c +++ b/lib/dns/zonekey.c @@ -45,7 +45,8 @@ dns_zonekey_iszonekey(dns_rdata_t *keyrdata) { iszonekey = false; } if (key.protocol != DNS_KEYPROTO_DNSSEC && - key.protocol != DNS_KEYPROTO_ANY) { + key.protocol != DNS_KEYPROTO_ANY) + { iszonekey = false; } diff --git a/lib/dns/zoneverify.c b/lib/dns/zoneverify.c index ff2943113e8..997f121df50 100644 --- a/lib/dns/zoneverify.c +++ b/lib/dns/zoneverify.c @@ -879,12 +879,14 @@ verifyset(vctx_t *vctx, dns_rdataset_t *rdataset, const dns_name_t *name, result = ISC_R_SUCCESS; if (memcmp(set_algorithms, vctx->act_algorithms, - sizeof(set_algorithms)) != 0) { + sizeof(set_algorithms)) != 0) + { dns_name_format(name, namebuf, sizeof(namebuf)); dns_rdatatype_format(rdataset->type, typebuf, sizeof(typebuf)); for (size_t i = 0; i < ARRAY_SIZE(set_algorithms); i++) { if ((vctx->act_algorithms[i] != 0) && - (set_algorithms[i] == 0)) { + (set_algorithms[i] == 0)) + { dns_secalg_format(i, algbuf, sizeof(algbuf)); zoneverify_log_error(vctx, "No correct %s signature " @@ -1242,13 +1244,15 @@ verifyemptynodes(const vctx_t *vctx, const dns_name_t *name, nlabels = dns_name_countlabels(name); if (reln == dns_namereln_commonancestor || - reln == dns_namereln_contains) { + reln == dns_namereln_contains) + { dns_name_init(&suffix, NULL); for (i = labels + 1; i < nlabels; i++) { dns_name_getlabelsequence(name, nlabels - i, i, &suffix); if (nsec3paramset != NULL && - dns_rdataset_isassociated(nsec3paramset)) { + dns_rdataset_isassociated(nsec3paramset)) + { result = verifynsec3s( vctx, &suffix, nsec3paramset, isdelegation, true, NULL, 0, &tvresult); @@ -1522,7 +1526,8 @@ check_dnskey_sigs(vctx_t *vctx, const dns_rdata_dnskey_t *dnskey, RUNTIME_CHECK(result == ISC_R_SUCCESS); if (ds.key_tag != dst_key_id(key) || - ds.algorithm != dst_key_alg(key)) { + ds.algorithm != dst_key_alg(key)) + { continue; } @@ -1663,7 +1668,8 @@ determine_active_algorithms(vctx_t *vctx, bool ignore_kskflag, * the algorithm as bad if this is not met. */ if ((vctx->ksk_algorithms[i] != 0) == - (vctx->zsk_algorithms[i] != 0)) { + (vctx->zsk_algorithms[i] != 0)) + { continue; } dns_secalg_format(i, algbuf, sizeof(algbuf)); @@ -1773,7 +1779,8 @@ verify_nodes(vctx_t *vctx, isc_result_t *vresult) { result = dns_dbiterator_current(dbiter, &nextnode, nextname); if (result != ISC_R_SUCCESS && - result != DNS_R_NEWORIGIN) { + result != DNS_R_NEWORIGIN) + { zoneverify_log_error(vctx, "dns_dbiterator_current():" " %s", diff --git a/lib/dns/zt.c b/lib/dns/zt.c index cbc0a8df5fd..a0c300aaf0c 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -442,7 +442,8 @@ freezezones(dns_zone_t *zone, void *uap) { if (frozen) { result = dns_zone_loadandthaw(zone); if (result == DNS_R_CONTINUE || - result == DNS_R_UPTODATE) { + result == DNS_R_UPTODATE) + { result = ISC_R_SUCCESS; } } @@ -554,7 +555,8 @@ dns_zt_apply(dns_zt_t *zt, isc_rwlocktype_t lock, bool stop, isc_result_t *sub, tresult = result; goto cleanup; /* don't break */ } else if (result != ISC_R_SUCCESS && - tresult == ISC_R_SUCCESS) { + tresult == ISC_R_SUCCESS) + { tresult = result; } } diff --git a/lib/isc/file.c b/lib/isc/file.c index 6d457799cc4..bdf65fb4600 100644 --- a/lib/isc/file.c +++ b/lib/isc/file.c @@ -196,7 +196,8 @@ isc_file_settime(const char *file, isc_time_t *when) { * Here is the real check for the high bit being set. */ if ((times[0].tv_sec & - (1ULL << (sizeof(times[0].tv_sec) * CHAR_BIT - 1))) != 0) { + (1ULL << (sizeof(times[0].tv_sec) * CHAR_BIT - 1))) != 0) + { return (ISC_R_RANGE); } diff --git a/lib/isc/hashmap.c b/lib/isc/hashmap.c index 3526774cadd..0abb1220c2f 100644 --- a/lib/isc/hashmap.c +++ b/lib/isc/hashmap.c @@ -297,7 +297,8 @@ nexttable: } if (hashmap_match(node, hashval, key, keysize, - hashmap->case_sensitive)) { + hashmap->case_sensitive)) + { *pslp = psl; *idxp = idx; return (node); @@ -562,7 +563,8 @@ hashmap_add(isc_hashmap_t *hashmap, const uint32_t hashval, const uint8_t *key, } if (hashmap_match(current, hashval, key, keysize, - hashmap->case_sensitive)) { + hashmap->case_sensitive)) + { return (ISC_R_EXISTS); } /* Found rich node */ diff --git a/lib/isc/heap.c b/lib/isc/heap.c index 0f7de62c86d..7b0cc288541 100644 --- a/lib/isc/heap.c +++ b/lib/isc/heap.c @@ -169,7 +169,8 @@ sink_down(isc_heap_t *heap, unsigned int i, void *elt) { /* Find the smallest of the (at most) two children. */ j = heap_left(i); if (j < size && - heap->compare(heap->array[j + 1], heap->array[j])) { + heap->compare(heap->array[j + 1], heap->array[j])) + { j++; } if (heap->compare(elt, heap->array[j])) { diff --git a/lib/isc/ht.c b/lib/isc/ht.c index f1bfa0d9894..d9de112e54b 100644 --- a/lib/isc/ht.c +++ b/lib/isc/ht.c @@ -484,7 +484,8 @@ isc__ht_iter_next(isc_ht_iter_t *it) { isc_ht_t *ht = it->ht; while (it->i < ht->size[it->hindex] && - ht->table[it->hindex][it->i] == NULL) { + ht->table[it->hindex][it->i] == NULL) + { it->i++; } diff --git a/lib/isc/lex.c b/lib/isc/lex.c index 61476808edb..2796fc8eb2c 100644 --- a/lib/isc/lex.c +++ b/lib/isc/lex.c @@ -380,7 +380,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { if (isc_buffer_remaininglength(source->pushback) == 0 && source->at_eof) { if ((options & ISC_LEXOPT_DNSMULTILINE) != 0 && - lex->paren_count != 0) { + lex->paren_count != 0) + { lex->paren_count = 0; return (ISC_R_UNBALANCED); } @@ -490,7 +491,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { no_comments = true; continue; } else if (c == '#' && ((lex->comments & - ISC_LEXCOMMENT_SHELL) != 0)) { + ISC_LEXCOMMENT_SHELL) != 0)) + { saved_state = state; state = lexstate_eatline; no_comments = true; @@ -505,13 +507,15 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { if (c == EOF) { lex->last_was_eol = false; if ((options & ISC_LEXOPT_DNSMULTILINE) != 0 && - lex->paren_count != 0) { + lex->paren_count != 0) + { lex->paren_count = 0; result = ISC_R_UNBALANCED; goto done; } if ((options & ISC_LEXOPT_BTEXT) != 0 && - lex->brace_count != 0) { + lex->brace_count != 0) + { lex->brace_count = 0; result = ISC_R_UNBALANCED; goto done; @@ -524,7 +528,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { done = true; } else if (c == ' ' || c == '\t') { if (lex->last_was_eol && - (options & ISC_LEXOPT_INITIALWS) != 0) { + (options & ISC_LEXOPT_INITIALWS) != 0) + { lex->last_was_eol = false; tokenp->type = isc_tokentype_initialws; tokenp->value.as_char = c; @@ -541,14 +546,16 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { state = lexstate_crlf; } } else if (c == '"' && - (options & ISC_LEXOPT_QSTRING) != 0) { + (options & ISC_LEXOPT_QSTRING) != 0) + { lex->last_was_eol = false; no_comments = true; state = lexstate_qstring; } else if (lex->specials[c]) { lex->last_was_eol = false; if ((c == '(' || c == ')') && - (options & ISC_LEXOPT_DNSMULTILINE) != 0) { + (options & ISC_LEXOPT_DNSMULTILINE) != 0) + { if (c == '(') { if (lex->paren_count == 0) { options &= ~IWSEOL; @@ -567,7 +574,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { } continue; } else if (c == '{' && - (options & ISC_LEXOPT_BTEXT) != 0) { + (options & ISC_LEXOPT_BTEXT) != 0) + { if (lex->brace_count != 0) { result = ISC_R_UNBALANCED; goto done; @@ -582,10 +590,12 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { tokenp->value.as_char = c; done = true; } else if (isdigit((unsigned char)c) && - (options & ISC_LEXOPT_NUMBER) != 0) { + (options & ISC_LEXOPT_NUMBER) != 0) + { lex->last_was_eol = false; if ((options & ISC_LEXOPT_OCTAL) != 0 && - (c == '8' || c == '9')) { + (c == '8' || c == '9')) + { state = lexstate_string; } else { state = lexstate_number; @@ -614,7 +624,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { if ((options & ISC_LEXOPT_OCTAL) != 0) { base = 8; } else if ((options & - ISC_LEXOPT_CNUMBER) != 0) { + ISC_LEXOPT_CNUMBER) != 0) + { base = 0; } else { base = 10; @@ -654,7 +665,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { state = lexstate_string; } } else if ((options & ISC_LEXOPT_OCTAL) != 0 && - (c == '8' || c == '9')) { + (c == '8' || c == '9')) + { state = lexstate_string; } if (remaining == 0U) { @@ -671,7 +683,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { break; case lexstate_string: if (!escaped && c == '=' && - (options & ISC_LEXOPT_VPAIR) != 0) { + (options & ISC_LEXOPT_VPAIR) != 0) + { if (remaining == 0U) { result = grow_data(lex, &remaining, &curr, &prev); @@ -690,7 +703,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { case lexstate_vpairstart: if (state == lexstate_vpairstart) { if (c == '"' && - (options & ISC_LEXOPT_QVPAIR) != 0) { + (options & ISC_LEXOPT_QVPAIR) != 0) + { no_comments = true; state = lexstate_qvpair; break; @@ -824,7 +838,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { } else { if (c == '\n' && !escaped && (options & ISC_LEXOPT_QSTRINGMULTILINE) == - 0) { + 0) + { pushback(source, c); result = ISC_R_UNBALANCEDQUOTES; goto done; @@ -950,13 +965,15 @@ isc_lex_getmastertoken(isc_lex_t *lex, isc_token_t *token, return (ISC_R_SUCCESS); } if (token->type == isc_tokentype_vpair && - expect == isc_tokentype_qvpair) { + expect == isc_tokentype_qvpair) + { return (ISC_R_SUCCESS); } if (token->type != expect) { isc_lex_ungettoken(lex, token); if (token->type == isc_tokentype_eol || - token->type == isc_tokentype_eof) { + token->type == isc_tokentype_eof) + { return (ISC_R_UNEXPECTEDEND); } if (expect == isc_tokentype_number) { @@ -990,7 +1007,8 @@ isc_lex_getoctaltoken(isc_lex_t *lex, isc_token_t *token, bool eol) { if (token->type != isc_tokentype_number) { isc_lex_ungettoken(lex, token); if (token->type == isc_tokentype_eol || - token->type == isc_tokentype_eof) { + token->type == isc_tokentype_eof) + { return (ISC_R_UNEXPECTEDEND); } return (ISC_R_BADNUMBER); diff --git a/lib/isc/log.c b/lib/isc/log.c index 011d027a124..5547495f7f5 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -913,7 +913,8 @@ isc_log_closefilelogs(isc_log_t *lctx) { channel != NULL; channel = ISC_LIST_NEXT(channel, link)) { if (channel->type == ISC_LOG_TOFILE && - FILE_STREAM(channel) != NULL) { + FILE_STREAM(channel) != NULL) + { (void)fclose(FILE_STREAM(channel)); FILE_STREAM(channel) = NULL; } @@ -1063,7 +1064,8 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) { if (*digit_end == '\0' && version >= versions) { result = isc_file_remove(dir.entry.name); if (result != ISC_R_SUCCESS && - result != ISC_R_FILENOTFOUND) { + result != ISC_R_FILENOTFOUND) + { syslog(LOG_ERR, "unable to remove " "log file '%s': %s", @@ -1199,7 +1201,8 @@ remove_old_tsversions(isc_logfile_t *file, int versions) { if (*digit_end == '\0' && version < last) { result = isc_file_remove(dir.entry.name); if (result != ISC_R_SUCCESS && - result != ISC_R_FILENOTFOUND) { + result != ISC_R_FILENOTFOUND) + { syslog(LOG_ERR, "unable to remove " "log file '%s': %s", @@ -1236,7 +1239,8 @@ roll_increment(isc_logfile_t *file) { n = snprintf(current, sizeof(current), "%s.%u", path, (unsigned int)greatest); if (n >= (int)sizeof(current) || n < 0 || - !isc_file_exists(current)) { + !isc_file_exists(current)) + { break; } } @@ -1553,7 +1557,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, } if (category_channels->module != NULL && - category_channels->module != module) { + category_channels->module != module) + { category_channels = ISC_LIST_NEXT(category_channels, link); continue; @@ -1567,7 +1572,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, if (!forcelog) { dlevel = atomic_load_acquire(&lctx->debug_level); if (((channel->flags & ISC_LOG_DEBUGONLY) != 0) && - dlevel == 0) { + dlevel == 0) + { continue; } @@ -1581,7 +1587,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, } if ((channel->flags & ISC_LOG_PRINTTIME) != 0 && - local_time[0] == '\0') { + local_time[0] == '\0') + { isc_time_t isctime; TIME_NOW(&isctime); @@ -1595,7 +1602,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, } if ((channel->flags & ISC_LOG_PRINTLEVEL) != 0 && - level_string[0] == '\0') { + level_string[0] == '\0') + { if (level < ISC_LOG_CRITICAL) { snprintf(level_string, sizeof(level_string), "level %d: ", level); @@ -1649,7 +1657,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, while (message != NULL) { if (isc_time_compare(&message->time, - &oldest) < 0) { + &oldest) < 0) + { /* * This message is older * than the @@ -1686,7 +1695,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, * ... */ if (strcmp(lctx->buffer, - message->text) == 0) { + message->text) == 0) + { /* * ... and it is a * duplicate. Unlock the diff --git a/lib/isc/mem.c b/lib/isc/mem.c index 043a60e2464..7abb743a587 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -1417,7 +1417,8 @@ print_contexts(FILE *file) { isc_mem_t *ctx; for (ctx = ISC_LIST_HEAD(contexts); ctx != NULL; - ctx = ISC_LIST_NEXT(ctx, link)) { + ctx = ISC_LIST_NEXT(ctx, link)) + { fprintf(file, "context: %p (%s): %" PRIuFAST32 " references\n", ctx, ctx->name[0] == 0 ? "" : ctx->name, isc_refcount_current(&ctx->references)); @@ -1573,7 +1574,8 @@ isc_mem_renderxml(void *writer0) { LOCK(&contextslock); lost = totallost; for (ctx = ISC_LIST_HEAD(contexts); ctx != NULL; - ctx = ISC_LIST_NEXT(ctx, link)) { + ctx = ISC_LIST_NEXT(ctx, link)) + { xmlrc = xml_renderctx(ctx, &summary, writer); if (xmlrc < 0) { UNLOCK(&contextslock); @@ -1715,7 +1717,8 @@ isc_mem_renderjson(void *memobj0) { LOCK(&contextslock); lost = totallost; for (ctx = ISC_LIST_HEAD(contexts); ctx != NULL; - ctx = ISC_LIST_NEXT(ctx, link)) { + ctx = ISC_LIST_NEXT(ctx, link)) + { result = json_renderctx(ctx, &summary, ctxarray); if (result != ISC_R_SUCCESS) { UNLOCK(&contextslock); diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c index 940fbf0370c..c674d839b27 100644 --- a/lib/isc/netaddr.c +++ b/lib/isc/netaddr.c @@ -245,7 +245,8 @@ isc_netaddr_prefixok(const isc_netaddr_t *na, unsigned int prefixlen) { nbytes++; } if (nbytes < ipbytes && - memcmp(p + nbytes, zeros, ipbytes - nbytes) != 0) { + memcmp(p + nbytes, zeros, ipbytes - nbytes) != 0) + { return (ISC_R_FAILURE); } return (ISC_R_SUCCESS); diff --git a/lib/isc/netmgr/http.c b/lib/isc/netmgr/http.c index 3576bc6279d..bd4a02ed682 100644 --- a/lib/isc/netmgr/http.c +++ b/lib/isc/netmgr/http.c @@ -565,7 +565,8 @@ on_server_data_chunk_recv_callback(int32_t stream_id, const uint8_t *data, size_t new_bufsize = isc_buffer_usedlength(&h2->rbuf) + len; if (new_bufsize <= MAX_DNS_MESSAGE_SIZE && - new_bufsize <= h2->content_length) { + new_bufsize <= h2->content_length) + { isc_buffer_putmem(&h2->rbuf, data, len); break; } @@ -1731,7 +1732,8 @@ server_handle_path_header(isc_nmsocket_t *socket, const uint8_t *value, size_t dns_value_len = 0; if (isc__nm_parse_httpquery((const char *)qstr, &dns_value, - &dns_value_len)) { + &dns_value_len)) + { const size_t decoded_size = dns_value_len / 4 * 3; if (decoded_size <= MAX_DNS_MESSAGE_SIZE) { if (socket->h2.query_data != NULL) { @@ -2220,7 +2222,8 @@ server_httpsend(isc_nmhandle_t *handle, isc_nmsocket_t *sock, isc_nm_cb_t cb = req->cb.send; void *cbarg = req->cbarg; if (isc__nmsocket_closing(sock) || - !http_session_active(handle->httpsession)) { + !http_session_active(handle->httpsession)) + { failed_send_cb(sock, req, ISC_R_CANCELED); return; } @@ -2738,7 +2741,8 @@ isc__nm_http_close(isc_nmsocket_t *sock) { REQUIRE(!isc__nmsocket_active(sock)); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { return; } @@ -3209,9 +3213,11 @@ isc__nm_http_cleanup_data(isc_nmsocket_t *sock) { } if (sock->type == isc_nm_httplistener || - sock->type == isc_nm_httpsocket) { + sock->type == isc_nm_httpsocket) + { if (sock->type == isc_nm_httplistener && - sock->h2.listener_endpoints != NULL) { + sock->h2.listener_endpoints != NULL) + { /* Delete all handlers */ http_cleanup_listener_endpoints(sock); } @@ -3321,7 +3327,8 @@ isc_nm_http_makeuri(const bool https, const isc_sockaddr_t *sa, * wrap it between [ and ]. */ if (inet_pton(AF_INET6, hostname, &sa6) == 1 && - hostname[0] != '[') { + hostname[0] != '[') + { ipv6_addr = true; } host = hostname; @@ -3539,7 +3546,8 @@ rule_value_char(isc_httpparser_state_t *st) { static bool rule_unreserved_char(isc_httpparser_state_t *st) { if (MATCH_ALNUM() || MATCH('_') || MATCH('.') || MATCH('-') || - MATCH('~')) { + MATCH('~')) + { ADVANCE(); return (true); } diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c index f2b4127cf2a..d7dc2334095 100644 --- a/lib/isc/netmgr/netmgr.c +++ b/lib/isc/netmgr/netmgr.c @@ -664,7 +664,8 @@ nmsocket_cleanup(isc_nmsocket_t *sock, bool dofree FLARG) { for (size_t i = 0; i < sock->nchildren; i++) { REQUIRE(!atomic_load(&sock->children[i].destroying)); if (isc_refcount_decrement( - &sock->children[i].references)) { + &sock->children[i].references)) + { nmsocket_cleanup(&sock->children[i], false FLARG_PASS); } @@ -1964,7 +1965,8 @@ isc___nm_uvreq_put(isc__nm_uvreq_t **req0, isc_nmsocket_t *sock FLARG) { #if !__SANITIZE_ADDRESS__ && !__SANITIZE_THREAD__ if (!isc__nmsocket_active(sock) || - !isc_astack_trypush(sock->inactivereqs, req)) { + !isc_astack_trypush(sock->inactivereqs, req)) + { isc_mem_put(sock->worker->mctx, req, sizeof(*req)); } #else /* !__SANITIZE_ADDRESS__ && !__SANITIZE_THREAD__ */ @@ -2118,7 +2120,8 @@ isc__nmsocket_stop(isc_nmsocket_t *listener) { REQUIRE(listener->tid == 0); if (!atomic_compare_exchange_strong(&listener->closing, - &(bool){ false }, true)) { + &(bool){ false }, true)) + { UNREACHABLE(); } diff --git a/lib/isc/netmgr/socket.c b/lib/isc/netmgr/socket.c index 7a706c44cbe..b2dce27805e 100644 --- a/lib/isc/netmgr/socket.c +++ b/lib/isc/netmgr/socket.c @@ -344,7 +344,8 @@ isc_result_t isc__nm_socket_tcp_maxseg(uv_os_sock_t fd, int size) { #ifdef TCP_MAXSEG if (setsockopt(fd, IPPROTO_TCP, TCP_MAXSEG, (void *)&size, - sizeof(size))) { + sizeof(size))) + { return (ISC_R_FAILURE); } else { return (ISC_R_SUCCESS); @@ -367,7 +368,8 @@ isc__nm_socket_min_mtu(uv_os_sock_t fd, sa_family_t sa_family) { } #elif defined(IPV6_MTU) if (setsockopt(fd, IPPROTO_IPV6, IPV6_MTU, &(int){ 1280 }, - sizeof(int)) == -1) { + sizeof(int)) == -1) + { return (ISC_R_FAILURE); } #else diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c index e5f3178ace1..f672c51532b 100644 --- a/lib/isc/netmgr/tcpdns.c +++ b/lib/isc/netmgr/tcpdns.c @@ -1248,7 +1248,8 @@ tcpdns_stop_cb(uv_handle_t *handle) { uv_handle_set_data(handle, NULL); if (!atomic_compare_exchange_strong(&sock->closed, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -1266,7 +1267,8 @@ tcpdns_close_sock(isc_nmsocket_t *sock) { REQUIRE(atomic_load(&sock->closing)); if (!atomic_compare_exchange_strong(&sock->closed, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -1337,7 +1339,8 @@ isc__nm_tcpdns_close(isc_nmsocket_t *sock) { REQUIRE(!isc__nmsocket_active(sock)); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { return; } diff --git a/lib/isc/netmgr/tlsdns.c b/lib/isc/netmgr/tlsdns.c index 536aa2a7f4b..db8d7095801 100644 --- a/lib/isc/netmgr/tlsdns.c +++ b/lib/isc/netmgr/tlsdns.c @@ -1149,7 +1149,8 @@ tls_cycle_input(isc_nmsocket_t *sock) { switch (err) { case SSL_ERROR_WANT_READ: if (sock->tls.state == TLS_STATE_NONE && - !SSL_is_init_finished(sock->tls.tls)) { + !SSL_is_init_finished(sock->tls.tls)) + { sock->tls.state = TLS_STATE_HANDSHAKE; result = isc__nm_process_sock_buffer(sock); if (result != ISC_R_SUCCESS) { @@ -1310,7 +1311,8 @@ tls_cycle_output(isc_nmsocket_t *sock) { int r; if (sock->tls.senddata.base != NULL || - sock->tls.senddata.length > 0) { + sock->tls.senddata.length > 0) + { break; } @@ -1886,7 +1888,8 @@ tlsdns_stop_cb(uv_handle_t *handle) { uv_handle_set_data(handle, NULL); if (!atomic_compare_exchange_strong(&sock->closed, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -1911,7 +1914,8 @@ tlsdns_close_sock(isc_nmsocket_t *sock) { REQUIRE(atomic_load(&sock->closing)); if (!atomic_compare_exchange_strong(&sock->closed, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -2002,7 +2006,8 @@ isc__nm_tlsdns_close(isc_nmsocket_t *sock) { REQUIRE(!isc__nmsocket_active(sock)); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { return; } @@ -2205,7 +2210,8 @@ isc__nm_async_tlsdns_set_tlsctx(isc_nmsocket_t *listener, isc_tlsctx_t *tlsctx, void isc__nm_tlsdns_cleanup_data(isc_nmsocket_t *sock) { if (sock->type == isc_nm_tlsdnslistener || - sock->type == isc_nm_tlsdnssocket) { + sock->type == isc_nm_tlsdnssocket) + { if (sock->tls.client_sess_cache != NULL) { INSIST(atomic_load(&sock->client)); INSIST(sock->type == isc_nm_tlsdnssocket); diff --git a/lib/isc/netmgr/tlsstream.c b/lib/isc/netmgr/tlsstream.c index e564d61fe47..a621dd25122 100644 --- a/lib/isc/netmgr/tlsstream.c +++ b/lib/isc/netmgr/tlsstream.c @@ -457,7 +457,8 @@ tls_do_bio(isc_nmsocket_t *sock, isc_region_t *received_data, isc_result_t hs_result = ISC_R_UNSET; rv = tls_try_handshake(sock, &hs_result); if (sock->tlsstream.state == TLS_IO && - hs_result != ISC_R_SUCCESS) { + hs_result != ISC_R_SUCCESS) + { /* * The accept callback has been called * unsuccessfully. Let's try to shut @@ -579,7 +580,8 @@ tls_do_bio(isc_nmsocket_t *sock, isc_region_t *received_data, return; case SSL_ERROR_WANT_READ: if (tls_try_to_close_unused_socket(sock) || - sock->outerhandle == NULL) { + sock->outerhandle == NULL) + { return; } @@ -915,7 +917,8 @@ isc__nm_tls_close(isc_nmsocket_t *sock) { REQUIRE(sock->type == isc_nm_tlssocket); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { return; } @@ -1062,7 +1065,8 @@ isc__nm_async_tlsdobio(isc__networker_t *worker, isc__netievent_t *ev0) { void isc__nm_tls_cleanup_data(isc_nmsocket_t *sock) { if (sock->type == isc_nm_tcplistener && - sock->tlsstream.tlslistener != NULL) { + sock->tlsstream.tlslistener != NULL) + { isc__nmsocket_detach(&sock->tlsstream.tlslistener); } else if (sock->type == isc_nm_tlslistener) { tls_cleanup_listener_tlsctx(sock); @@ -1088,7 +1092,8 @@ isc__nm_tls_cleanup_data(isc_nmsocket_t *sock) { &sock->tlsstream.client_sess_cache); } } else if (sock->type == isc_nm_tcpsocket && - sock->tlsstream.tlssocket != NULL) { + sock->tlsstream.tlssocket != NULL) + { /* * The TLS socket can't be destroyed until its underlying TCP * socket is, to avoid possible use-after-free errors. diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c index 6b7ae0810ce..7101a8f56dd 100644 --- a/lib/isc/netmgr/udp.c +++ b/lib/isc/netmgr/udp.c @@ -983,7 +983,8 @@ udp_close_cb(uv_handle_t *handle) { REQUIRE(atomic_load(&sock->closing)); if (!atomic_compare_exchange_strong(&sock->closed, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -1013,7 +1014,8 @@ isc__nm_udp_close(isc_nmsocket_t *sock) { REQUIRE(sock->tid == isc_tid()); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { return; } diff --git a/lib/isc/picohttpparser.c b/lib/isc/picohttpparser.c index 95c0d6f5114..d82fd019864 100644 --- a/lib/isc/picohttpparser.c +++ b/lib/isc/picohttpparser.c @@ -85,7 +85,8 @@ break; \ } else if (unlikely(!IS_PRINTABLE_ASCII(*buf))) { \ if ((unsigned char)*buf < '\040' || \ - *buf == '\177') { \ + *buf == '\177') \ + { \ *ret = -1; \ return NULL; \ } \ @@ -364,7 +365,8 @@ parse_headers(const char *buf, const char *buf_end, struct phr_header *headers, const char *value; size_t value_len; if ((buf = get_token_to_eol(buf, buf_end, &value, &value_len, - ret)) == NULL) { + ret)) == NULL) + { return NULL; } /* remove trailing SPs and HTABs */ @@ -397,7 +399,8 @@ parse_request(const char *buf, const char *buf_end, const char **method, /* parse request line */ if ((buf = parse_token(buf, buf_end, method, method_len, ' ', ret)) == - NULL) { + NULL) + { return NULL; } do { @@ -414,7 +417,8 @@ parse_request(const char *buf, const char *buf_end, const char **method, return NULL; } if ((buf = parse_http_version(buf, buf_end, minor_version, ret)) == - NULL) { + NULL) + { return NULL; } if (*buf == '\015') { @@ -470,7 +474,8 @@ parse_response(const char *buf, const char *buf_end, int *minor_version, size_t max_headers, int *ret) { /* parse "HTTP/1.x" */ if ((buf = parse_http_version(buf, buf_end, minor_version, ret)) == - NULL) { + NULL) + { return NULL; } /* skip space */ diff --git a/lib/isc/radix.c b/lib/isc/radix.c index a5dd28fddfa..d84e5d03020 100644 --- a/lib/isc/radix.c +++ b/lib/isc/radix.c @@ -123,7 +123,8 @@ _comp_with_mask(void *addr, void *dest, u_int mask) { u_int m = ((~0U) << (8 - (mask % 8))); if ((mask % 8) == 0 || - (((u_char *)addr)[n] & m) == (((u_char *)dest)[n] & m)) { + (((u_char *)addr)[n] & m) == (((u_char *)dest)[n] & m)) + { return (1); } } @@ -424,7 +425,8 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, /* Merging nodes */ for (i = 0; i < RADIX_FAMILIES; i++) { if (node->node_num[i] == -1 && - source->node_num[i] != -1) { + source->node_num[i] != -1) + { node->node_num[i] = radix->num_added_node + source->node_num[i]; diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c index 59ec0bffc22..d00ec7655fb 100644 --- a/lib/isc/rwlock.c +++ b/lib/isc/rwlock.c @@ -230,7 +230,8 @@ rwlock_lock(isc__rwlock_t *rwl, isc_rwlocktype_t type) { POST(cntflag); while (1) { if ((atomic_load_acquire(&rwl->cnt_and_flag) & - WRITER_ACTIVE) == 0) { + WRITER_ACTIVE) == 0) + { break; } @@ -238,7 +239,8 @@ rwlock_lock(isc__rwlock_t *rwl, isc_rwlocktype_t type) { LOCK(&rwl->lock); rwl->readers_waiting++; if ((atomic_load_acquire(&rwl->cnt_and_flag) & - WRITER_ACTIVE) != 0) { + WRITER_ACTIVE) != 0) + { WAIT(&rwl->readable, &rwl->lock); } rwl->readers_waiting--; @@ -282,10 +284,12 @@ rwlock_lock(isc__rwlock_t *rwl, isc_rwlocktype_t type) { /* enter the waiting queue, and wait for our turn */ prev_writer = atomic_fetch_add_release(&rwl->write_requests, 1); while (atomic_load_acquire(&rwl->write_completions) != - prev_writer) { + prev_writer) + { LOCK(&rwl->lock); if (atomic_load_acquire(&rwl->write_completions) != - prev_writer) { + prev_writer) + { WAIT(&rwl->writeable, &rwl->lock); UNLOCK(&rwl->lock); continue; diff --git a/lib/isc/tls.c b/lib/isc/tls.c index 339df8809e9..c027ed91e04 100644 --- a/lib/isc/tls.c +++ b/lib/isc/tls.c @@ -1309,13 +1309,15 @@ isc_tlsctx_cache_add( found_client_sess_cache = entry->client_sess_cache[tr_offset][ipv6]; if (pfound_client_sess_cache != NULL && - found_client_sess_cache != NULL) { + found_client_sess_cache != NULL) + { INSIST(*pfound_client_sess_cache == NULL); *pfound_client_sess_cache = found_client_sess_cache; } result = ISC_R_EXISTS; } else if (result == ISC_R_SUCCESS && - entry->ctx[tr_offset][ipv6] == NULL) { + entry->ctx[tr_offset][ipv6] == NULL) + { /* * The hash table entry exists, but is not filled for this * particular transport/IP type combination. @@ -1381,7 +1383,8 @@ isc_tlsctx_cache_find( (void **)&entry); if (result == ISC_R_SUCCESS && pstore != NULL && - entry->ca_store != NULL) { + entry->ca_store != NULL) + { *pstore = entry->ca_store; } @@ -1392,12 +1395,14 @@ isc_tlsctx_cache_find( *pctx = entry->ctx[tr_offset][ipv6]; if (pfound_client_sess_cache != NULL && - found_client_sess_cache != NULL) { + found_client_sess_cache != NULL) + { INSIST(*pfound_client_sess_cache == NULL); *pfound_client_sess_cache = found_client_sess_cache; } } else if (result == ISC_R_SUCCESS && - entry->ctx[tr_offset][ipv6] == NULL) { + entry->ctx[tr_offset][ipv6] == NULL) + { result = ISC_R_NOTFOUND; } else { INSIST(result != ISC_R_SUCCESS); diff --git a/lib/isc/url.c b/lib/isc/url.c index 7f618743410..cccb712be34 100644 --- a/lib/isc/url.c +++ b/lib/isc/url.c @@ -631,7 +631,8 @@ isc_url_parse(const char *buf, size_t buflen, bool is_connect, /* CONNECT requests can only contain "hostname:port" */ if (is_connect && - up->field_set != ((1 << ISC_UF_HOST) | (1 << ISC_UF_PORT))) { + up->field_set != ((1 << ISC_UF_HOST) | (1 << ISC_UF_PORT))) + { return (ISC_R_FAILURE); } diff --git a/lib/isc/utf8.c b/lib/isc/utf8.c index 6c86713466c..a348c5dab2f 100644 --- a/lib/isc/utf8.c +++ b/lib/isc/utf8.c @@ -37,7 +37,8 @@ isc_utf8_valid(const unsigned char *buf, size_t len) { continue; } if ((i + 1) < len && (buf[i] & 0xe0) == 0xc0 && - (buf[i + 1] & 0xc0) == 0x80) { + (buf[i + 1] & 0xc0) == 0x80) + { unsigned int w; w = (buf[i] & 0x1f) << 6; w |= (buf[++i] & 0x3f); diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c index e7015ec43e6..182ada0b009 100644 --- a/lib/isccc/alist.c +++ b/lib/isccc/alist.c @@ -284,7 +284,8 @@ isccc_alist_prettyprint(isccc_sexpr_t *sexpr, unsigned int indent, fprintf(stream, "{\n"); indent += 4; for (elt = isccc_alist_first(sexpr); elt != NULL; - elt = CDR(elt)) { + elt = CDR(elt)) + { kv = CAR(elt); INSIST(isccc_sexpr_listp(kv)); k = CAR(kv); diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c index 83075f54f2a..52914ed5ae6 100644 --- a/lib/isccc/cc.c +++ b/lib/isccc/cc.c @@ -206,7 +206,8 @@ table_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer) { unsigned int len; for (elt = isccc_alist_first(alist); elt != NULL; - elt = ISCCC_SEXPR_CDR(elt)) { + elt = ISCCC_SEXPR_CDR(elt)) + { kv = ISCCC_SEXPR_CAR(elt); k = ISCCC_SEXPR_CAR(kv); ks = isccc_sexpr_tostring(k); @@ -472,7 +473,8 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, value = region->rstart; GET8(valalg, value); if ((valalg != algorithm) || - !isc_safe_memequal(value, digestb64, HSHA_LENGTH)) { + !isc_safe_memequal(value, digestb64, HSHA_LENGTH)) + { return (ISCCC_R_BADAUTH); } } diff --git a/lib/isccc/symtab.c b/lib/isccc/symtab.c index a3185d19109..9260c211bb8 100644 --- a/lib/isccc/symtab.c +++ b/lib/isccc/symtab.c @@ -119,7 +119,8 @@ isccc_symtab_destroy(isccc_symtab_t **symtabp) { for (i = 0; i < symtab->size; i++) { for (elt = ISC_LIST_HEAD(symtab->table[i]); elt != NULL; - elt = nelt) { + elt = nelt) + { nelt = ISC_LIST_NEXT(elt, link); free_elt(symtab, i, elt); } @@ -166,14 +167,16 @@ hash(const char *key, bool case_sensitive) { b = hash((k), (s)->case_sensitive) % (s)->size; \ if ((s)->case_sensitive) { \ for (e = ISC_LIST_HEAD((s)->table[b]); e != NULL; \ - e = ISC_LIST_NEXT(e, link)) { \ + e = ISC_LIST_NEXT(e, link)) \ + { \ if (((t) == 0 || e->type == (t)) && \ strcmp(e->key, (k)) == 0) \ break; \ } \ } else { \ for (e = ISC_LIST_HEAD((s)->table[b]); e != NULL; \ - e = ISC_LIST_NEXT(e, link)) { \ + e = ISC_LIST_NEXT(e, link)) \ + { \ if (((t) == 0 || e->type == (t)) && \ strcasecmp(e->key, (k)) == 0) \ break; \ @@ -276,7 +279,8 @@ isccc_symtab_foreach(isccc_symtab_t *symtab, isccc_symtabforeachaction_t action, for (i = 0; i < symtab->size; i++) { for (elt = ISC_LIST_HEAD(symtab->table[i]); elt != NULL; - elt = nelt) { + elt = nelt) + { nelt = ISC_LIST_NEXT(elt, link); if ((action)(elt->key, elt->type, elt->value, arg)) { free_elt(symtab, i, elt); diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c index 752a20a4341..289c177a8d3 100644 --- a/lib/isccfg/aclconf.c +++ b/lib/isccfg/aclconf.c @@ -78,7 +78,8 @@ cfg_aclconfctx_detach(cfg_aclconfctx_t **actxp) { dns_acl_t *dacl, *next; isc_refcount_destroy(&actx->references); for (dacl = ISC_LIST_HEAD(actx->named_acl_cache); dacl != NULL; - dacl = next) { + dacl = next) + { next = ISC_LIST_NEXT(dacl, nextincache); ISC_LIST_UNLINK(actx->named_acl_cache, dacl, nextincache); @@ -246,7 +247,8 @@ count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx, } #if defined(HAVE_GEOIP2) } else if (cfg_obj_istuple(ce) && - cfg_obj_isvoid(cfg_tuple_get(ce, "negated"))) { + cfg_obj_isvoid(cfg_tuple_get(ce, "negated"))) + { n++; #endif /* HAVE_GEOIP2 */ } else if (cfg_obj_isstring(ce)) { @@ -573,7 +575,8 @@ parse_geoip_element(const cfg_obj_t *obj, isc_log_t *lctx, subtype = dns_geoip_city_metrocode; de.geoip_elem.as_int = atoi(search); } else if (strcasecmp(stype, "tz") == 0 || - strcasecmp(stype, "timezone") == 0) { + strcasecmp(stype, "timezone") == 0) + { subtype = dns_geoip_city_timezonecode; strlcpy(de.geoip_elem.as_string, search, sizeof(de.geoip_elem.as_string)); @@ -709,29 +712,35 @@ cfg_acl_fromconfig2(const cfg_obj_t *acl_data, const cfg_obj_t *cctx, if (obj_transport != NULL && cfg_obj_isstring(obj_transport)) { if (strcasecmp(cfg_obj_asstring(obj_transport), - "udp") == 0) { + "udp") == 0) + { transports = isc_nm_udpsocket; encrypted = false; } else if (strcasecmp(cfg_obj_asstring(obj_transport), - "tcp") == 0) { + "tcp") == 0) + { transports = isc_nm_tcpdnssocket; encrypted = false; } else if (strcasecmp(cfg_obj_asstring(obj_transport), - "udp-tcp") == 0) { + "udp-tcp") == 0) + { /* Good ol' DNS over port 53 */ transports = isc_nm_tcpdnssocket | isc_nm_udpsocket; encrypted = false; } else if (strcasecmp(cfg_obj_asstring(obj_transport), - "tls") == 0) { + "tls") == 0) + { transports = isc_nm_tlsdnssocket; encrypted = true; } else if (strcasecmp(cfg_obj_asstring(obj_transport), - "http") == 0) { + "http") == 0) + { transports = isc_nm_httpsocket; encrypted = true; } else if (strcasecmp(cfg_obj_asstring(obj_transport), - "http-plain") == 0) { + "http-plain") == 0) + { transports = isc_nm_httpsocket; encrypted = false; } else { @@ -882,7 +891,8 @@ cfg_acl_fromconfig2(const cfg_obj_t *acl_data, const cfg_obj_t *cctx, } #if defined(HAVE_GEOIP2) } else if (cfg_obj_istuple(ce) && - cfg_obj_isvoid(cfg_tuple_get(ce, "negated"))) { + cfg_obj_isvoid(cfg_tuple_get(ce, "negated"))) + { INSIST(dacl->length < dacl->alloc); result = parse_geoip_element(ce, lctx, ctx, de); if (result != ISC_R_SUCCESS) { @@ -975,7 +985,8 @@ cfg_acl_fromconfig2(const cfg_obj_t *acl_data, const cfg_obj_t *cctx, * nonzero (i.e., in sortlists). */ if (de->nestedacl != NULL && - de->type != dns_aclelementtype_nestedacl) { + de->type != dns_aclelementtype_nestedacl) + { dns_acl_detach(&de->nestedacl); } diff --git a/lib/isccfg/kaspconf.c b/lib/isccfg/kaspconf.c index a0460ff9682..ba36b0d8ee9 100644 --- a/lib/isccfg/kaspconf.c +++ b/lib/isccfg/kaspconf.c @@ -477,7 +477,8 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, dns_kasp_t *default_kasp, continue; } if (role[i] != - (DNS_KASP_KEY_ROLE_ZSK | DNS_KASP_KEY_ROLE_KSK)) { + (DNS_KASP_KEY_ROLE_ZSK | DNS_KASP_KEY_ROLE_KSK)) + { cfg_obj_log(keys, logctx, ISC_LOG_ERROR, "dnssec-policy: algorithm %zu " "requires both KSK and ZSK roles", diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index e1e31aa62de..78c345de689 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -1069,7 +1069,8 @@ parse_portrange(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(parse_port(pctx, &obj->value.tuple[0])); CHECK(parse_port(pctx, &obj->value.tuple[1])); if (obj->value.tuple[0]->value.uint32 > - obj->value.tuple[1]->value.uint32) { + obj->value.tuple[1]->value.uint32) + { cfg_parser_error(pctx, CFG_LOG_NOPREP, "low port '%u' must not be larger " "than high port", @@ -1530,7 +1531,8 @@ parse_dtout(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { if (pctx->token.type == isc_tokentype_string) { CHECK(cfg_gettoken(pctx, 0)); if (strcasecmp(TOKEN_STRING(pctx), "size") == 0 && - obj->value.tuple[2] == NULL) { + obj->value.tuple[2] == NULL) + { CHECK(cfg_parse_obj(pctx, fields[2].type, &obj->value.tuple[2])); } else if (strcasecmp(TOKEN_STRING(pctx), "versions") == @@ -3203,7 +3205,8 @@ parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_parse_dscp(pctx, &dscp)); have_dscp++; } else if (have_port == 0 && have_dscp == 0 && - have_address == 0) { + have_address == 0) + { return (cfg_parse_sockaddr(pctx, type, ret)); } else { cfg_parser_error(pctx, CFG_LOG_NEAR, @@ -3812,14 +3815,16 @@ cfg_clause_validforzone(const char *name, unsigned int ztype) { for (clause = zone_clauses; clause->name != NULL; clause++) { if ((clause->flags & ztype) == 0 || - strcmp(clause->name, name) != 0) { + strcmp(clause->name, name) != 0) + { continue; } valid = true; } for (clause = zone_only_clauses; clause->name != NULL; clause++) { if ((clause->flags & ztype) == 0 || - strcmp(clause->name, name) != 0) { + strcmp(clause->name, name) != 0) + { continue; } valid = true; @@ -3912,7 +3917,8 @@ cfg_print_zonegrammar(const unsigned int zonetype, unsigned int flags, } if ((clause->flags & zonetype) == 0 || - strcasecmp(clause->name, "type") == 0) { + strcasecmp(clause->name, "type") == 0) + { continue; } cfg_print_indent(&pctx); diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index 140bdfc7b31..325396e4de8 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -1076,7 +1076,8 @@ cfg_print_duration(cfg_printer_t *pctx, const cfg_obj_t *obj) { * case this function will print "PT0S". */ if (duration.parts[6] > 0 || - (!D && !duration.parts[4] && !duration.parts[5])) { + (!D && !duration.parts[4] && !duration.parts[5])) + { durationlen[6] = 1 + numlen(duration.parts[6]); T = true; count += durationlen[6]; @@ -1105,7 +1106,8 @@ cfg_print_duration(cfg_printer_t *pctx, const cfg_obj_t *obj) { } /* Special case for seconds. */ if (duration.parts[6] > 0 || - (!D && !duration.parts[4] && !duration.parts[5])) { + (!D && !duration.parts[4] && !duration.parts[5])) + { snprintf(str, durationlen[6] + 2, "%u%c", (uint32_t)duration.parts[6], indicators[6]); } @@ -1625,7 +1627,8 @@ parse_geoip(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { if (pctx->token.type == isc_tokentype_string) { CHECK(cfg_gettoken(pctx, 0)); if (strcasecmp(TOKEN_STRING(pctx), "db") == 0 && - obj->value.tuple[1] == NULL) { + obj->value.tuple[1] == NULL) + { CHECK(cfg_parse_obj(pctx, fields[1].type, &obj->value.tuple[1])); } else { @@ -2008,7 +2011,8 @@ print_list(cfg_printer_t *pctx, const cfg_obj_t *obj) { const cfg_listelt_t *elt; for (elt = ISC_LIST_HEAD(*list); elt != NULL; - elt = ISC_LIST_NEXT(elt, link)) { + elt = ISC_LIST_NEXT(elt, link)) + { if ((pctx->flags & CFG_PRINTER_ONELINE) != 0) { cfg_print_obj(pctx, elt->obj); cfg_print_cstr(pctx, "; "); @@ -2107,7 +2111,8 @@ cfg_print_spacelist(cfg_printer_t *pctx, const cfg_obj_t *obj) { list = &obj->value.list; for (elt = ISC_LIST_HEAD(*list); elt != NULL; - elt = ISC_LIST_NEXT(elt, link)) { + elt = ISC_LIST_NEXT(elt, link)) + { cfg_print_obj(pctx, elt->obj); if (ISC_LIST_NEXT(elt, link) != NULL) { cfg_print_cstr(pctx, " "); @@ -2249,9 +2254,11 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { clause = NULL; for (clauseset = clausesets; *clauseset != NULL; clauseset++) { for (clause = *clauseset; clause->name != NULL; - clause++) { + clause++) + { if (strcasecmp(TOKEN_STRING(pctx), - clause->name) == 0) { + clause->name) == 0) + { goto done; } } @@ -2499,7 +2506,8 @@ cfg_print_mapbody(cfg_printer_t *pctx, const cfg_obj_t *obj) { REQUIRE(obj != NULL); for (clauseset = obj->value.map.clausesets; *clauseset != NULL; - clauseset++) { + clauseset++) + { isc_symvalue_t symval; const cfg_clausedef_t *clause; @@ -2515,7 +2523,8 @@ cfg_print_mapbody(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_listelt_t *elt; for (elt = ISC_LIST_HEAD(*list); elt != NULL; - elt = ISC_LIST_NEXT(elt, link)) { + elt = ISC_LIST_NEXT(elt, link)) + { print_symval(pctx, clause->name, elt->obj); } diff --git a/lib/ns/client.c b/lib/ns/client.c index 9bf472911f3..debb0b44616 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -827,7 +827,8 @@ ns_client_error(ns_client_t *client, isc_result_t result) { int loglevel; if ((client->manager->sctx->options & NS_SERVER_LOGQUERIES) != - 0) { + 0) + { loglevel = DNS_RRL_LOG_DROP; } else { loglevel = ISC_LOG_DEBUG(1); @@ -1955,7 +1956,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_result_t eresult, * Simulate a STD13 compliant server. */ if ((client->manager->sctx->options & NS_SERVER_EDNSFORMERR) != - 0) { + 0) + { ns_client_error(client, DNS_R_FORMERR); return; } @@ -1964,7 +1966,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_result_t eresult, * Are returning NOTIMP to all EDNS queries? */ if ((client->manager->sctx->options & NS_SERVER_EDNSNOTIMP) != - 0) { + 0) + { ns_client_error(client, DNS_R_NOTIMP); return; } @@ -1973,7 +1976,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_result_t eresult, * Are returning REFUSED to all EDNS queries? */ if ((client->manager->sctx->options & NS_SERVER_EDNSREFUSED) != - 0) { + 0) + { ns_client_error(client, DNS_R_REFUSED); return; } diff --git a/lib/ns/hooks.c b/lib/ns/hooks.c index 985a82907b7..2657533f1a3 100644 --- a/lib/ns/hooks.c +++ b/lib/ns/hooks.c @@ -296,7 +296,8 @@ ns_hooktable_free(isc_mem_t *mctx, void **tablep) { for (i = 0; i < NS_HOOKPOINTS_COUNT; i++) { for (hook = ISC_LIST_HEAD((*table)[i]); hook != NULL; - hook = next) { + hook = next) + { next = ISC_LIST_NEXT(hook, link); ISC_LIST_UNLINK((*table)[i], hook, link); if (hook->mctx != NULL) { diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c index fcec91e4896..4f4253e4881 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -120,7 +120,8 @@ need_rescan(ns_interfacemgr_t *mgr, struct MSGHDR *rtm, size_t len) { * state changes. */ if (rth->rta_type == IFA_ADDRESS && - ifa->ifa_family == AF_INET6) { + ifa->ifa_family == AF_INET6) + { bool existed = false; bool was_listening = false; isc_netaddr_t addr = { 0 }; @@ -176,7 +177,8 @@ need_rescan(ns_interfacemgr_t *mgr, struct MSGHDR *rtm, size_t len) { return (true); } } else if (rth->rta_type == IFA_ADDRESS && - ifa->ifa_family == AF_INET) { + ifa->ifa_family == AF_INET) + { /* * It seems that the IPv4 P2P link state * has changed. @@ -709,7 +711,8 @@ interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, const char *name, result = ns_interface_listentcp(ifp); if (result != ISC_R_SUCCESS) { if ((result == ISC_R_ADDRINUSE) && - (addr_in_use != NULL)) { + (addr_in_use != NULL)) + { *addr_in_use = true; } @@ -1172,11 +1175,13 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) { * a temporary media glitch at rescan time. */ if (family == AF_INET && - isc_netaddr_equal(&interface.address, &zero_address)) { + isc_netaddr_equal(&interface.address, &zero_address)) + { continue; } if (family == AF_INET6 && - isc_netaddr_equal(&interface.address, &zero_address6)) { + isc_netaddr_equal(&interface.address, &zero_address6)) + { continue; } @@ -1199,7 +1204,8 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) { ll = (family == AF_INET) ? mgr->listenon4 : mgr->listenon6; dolistenon = true; for (le = ISC_LIST_HEAD(ll->elts); le != NULL; - le = ISC_LIST_NEXT(le, link)) { + le = ISC_LIST_NEXT(le, link)) + { int match; bool addr_in_use = false; bool ipv6_wildcard = false; @@ -1233,7 +1239,8 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) { * special considerations later, so remember it. */ if (family == AF_INET6 && ipv6only && ipv6pktinfo && - listenon_is_ip6_any(le)) { + listenon_is_ip6_any(le)) + { ipv6_wildcard = true; } @@ -1266,7 +1273,8 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) { } if (log_explicit && family == AF_INET6 && - listenon_is_ip6_any(le)) { + listenon_is_ip6_any(le)) + { isc_log_write(IFMGR_COMMON_LOGARGS, verbose ? ISC_LOG_INFO : ISC_LOG_DEBUG(1), diff --git a/lib/ns/listenlist.c b/lib/ns/listenlist.c index 85fc12eb631..df9719f5e14 100644 --- a/lib/ns/listenlist.c +++ b/lib/ns/listenlist.c @@ -103,7 +103,8 @@ listenelt_create(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp, if (tls_params->dhparam_file != NULL) { if (!isc_tlsctx_load_dhparams( - sslctx, tls_params->dhparam_file)) { + sslctx, tls_params->dhparam_file)) + { result = ISC_R_FAILURE; goto tls_error; } diff --git a/lib/ns/query.c b/lib/ns/query.c index acb1c6355ca..e37a96de8ef 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -966,7 +966,8 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, * and should not be disclosed. */ if (dns_zone_gettype(zone) == dns_zone_staticstub && - !RECURSIONOK(client)) { + !RECURSIONOK(client)) + { return (DNS_R_REFUSED); } @@ -1010,7 +1011,8 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, */ dbversion->acl_checked = true; if ((client->query.attributes & NS_QUERYATTR_QUERYOK) == - 0) { + 0) + { dbversion->queryok = false; return (DNS_R_REFUSED); } @@ -1306,7 +1308,8 @@ rpz_getdb(ns_client_t *client, dns_name_t *p_name, dns_rpz_type_t rpz_type, * logging is disabled for some policy zones. */ if (st->popt.no_log == 0 && - isc_log_wouldlog(ns_lctx, DNS_RPZ_DEBUG_LEVEL2)) { + isc_log_wouldlog(ns_lctx, DNS_RPZ_DEBUG_LEVEL2)) + { dns_name_format(client->query.qname, qnamebuf, sizeof(qnamebuf)); dns_name_format(p_name, p_namebuf, sizeof(p_namebuf)); @@ -1386,7 +1389,8 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype, * Only try if DLZ drivers are loaded for this view */ if (zonelabels < namelabels && - !ISC_LIST_EMPTY(client->view->dlz_searched)) { + !ISC_LIST_EMPTY(client->view->dlz_searched)) + { dns_clientinfomethods_t cm; dns_clientinfo_t ci; dns_db_t *tdbp; @@ -1467,7 +1471,8 @@ query_isduplicate(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type, CTRACE(ISC_LOG_DEBUG(3), "query_isduplicate"); for (section = DNS_SECTION_ANSWER; section <= DNS_SECTION_ADDITIONAL; - section++) { + section++) + { result = dns_message_findname(client->message, section, name, type, 0, &mname, NULL); if (result == ISC_R_SUCCESS) { @@ -1549,7 +1554,8 @@ query_additionalauthfind(dns_db_t *db, dns_dbversion_t *version, } if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } @@ -1827,7 +1833,8 @@ try_glue: client->now, &node, fname, &cm, &ci, rdataset, sigrdataset); if (result != ISC_R_SUCCESS && result != DNS_R_ZONECUT && - result != DNS_R_GLUE) { + result != DNS_R_GLUE) + { goto cleanup; } @@ -1870,7 +1877,8 @@ found: * in the response. */ if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { ISC_LIST_APPEND(fname->list, sigrdataset, link); sigrdataset = NULL; } @@ -1908,7 +1916,8 @@ found: } else if (result == DNS_R_NCACHENXRRSET) { dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } } else if (result == ISC_R_SUCCESS) { @@ -1926,7 +1935,8 @@ found: if (invalid && DNS_TRUST_PENDING(rdataset->trust)) { dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } } else if (!query_isduplicate(client, fname, @@ -1944,7 +1954,8 @@ found: ISC_LIST_APPEND(fname->list, rdataset, link); added_something = true; if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { ISC_LIST_APPEND(fname->list, sigrdataset, link); sigrdataset = @@ -1954,7 +1965,8 @@ found: } else { dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } } @@ -1972,7 +1984,8 @@ found: } else if (result == DNS_R_NCACHENXRRSET) { dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } } else if (result == ISC_R_SUCCESS) { @@ -1992,12 +2005,14 @@ found: if (invalid && DNS_TRUST_PENDING(rdataset->trust)) { dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } } else if (!query_isduplicate(client, fname, dns_rdatatype_aaaa, - &mname)) { + &mname)) + { if (mname != fname) { if (mname != NULL) { ns_client_releasename(client, @@ -2010,7 +2025,8 @@ found: ISC_LIST_APPEND(fname->list, rdataset, link); added_something = true; if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { ISC_LIST_APPEND(fname->list, sigrdataset, link); sigrdataset = NULL; @@ -3203,7 +3219,8 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, return (DNS_R_SERVFAIL); } if (qtype == dns_rdatatype_aaaa && - !ISC_LIST_EMPTY(client->view->dns64)) { + !ISC_LIST_EMPTY(client->view->dns64)) + { for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; result = dns_rdatasetiter_next(rdsiter)) @@ -3221,7 +3238,8 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, { dns_rdatasetiter_current(rdsiter, *rdatasetp); if ((*rdatasetp)->type == dns_rdatatype_cname || - (*rdatasetp)->type == qtype) { + (*rdatasetp)->type == qtype) + { break; } dns_rdataset_disassociate(*rdatasetp); @@ -3246,7 +3264,8 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, dns_db_detachnode(*dbp, nodep); if (qtype == dns_rdatatype_rrsig || - qtype == dns_rdatatype_sig) { + qtype == dns_rdatatype_sig) + { result = DNS_R_NXRRSET; } else { result = dns_db_findext(*dbp, p_name, *versionp, @@ -3476,7 +3495,8 @@ dnsrps_set_p(librpz_emsg_t *emsg, ns_client_t *client, dns_rpz_st_t *st, if (result == ISC_R_SUCCESS) { if (searchtype == dns_rdatatype_cname && - qtype != dns_rdatatype_cname) { + qtype != dns_rdatatype_cname) + { result = DNS_R_CNAME; } } else if (result == DNS_R_NXRRSET) { @@ -3804,7 +3824,8 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name, return (ISC_R_SUCCESS); default: if (client->query.rpz_st->m.policy != - DNS_RPZ_POLICY_ERROR) { + DNS_RPZ_POLICY_ERROR) + { client->query.rpz_st->m.policy = DNS_RPZ_POLICY_ERROR; rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, name, @@ -4101,7 +4122,8 @@ rpz_rewrite_ns_skip(ns_client_t *client, dns_name_t *nsname, DNS_RPZ_TYPE_NSDNAME, str, result); } if (st->r.ns_rdataset != NULL && - dns_rdataset_isassociated(st->r.ns_rdataset)) { + dns_rdataset_isassociated(st->r.ns_rdataset)) + { dns_rdataset_disassociate(st->r.ns_rdataset); } @@ -4267,7 +4289,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, dns_rpz_zbits_t allowed; if (!st->popt.dnsrps_enabled && - qresult_type == qresult_type_recurse) { + qresult_type == qresult_type_recurse) + { /* * This request needs recursion that has not been done. * Get bits for the policy zones that do not need @@ -4399,7 +4422,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, nsname); } if (st->r.ns_rdataset == NULL || - !dns_rdataset_isassociated(st->r.ns_rdataset)) { + !dns_rdataset_isassociated(st->r.ns_rdataset)) + { dns_db_t *db = NULL; result = rpz_rrset_find(client, nsname, dns_rdatatype_ns, options, @@ -4553,7 +4577,8 @@ cleanup: st->m.policy == DNS_RPZ_POLICY_ERROR) { if (st->m.policy == DNS_RPZ_POLICY_PASSTHRU && - result != DNS_R_DELEGATION) { + result != DNS_R_DELEGATION) + { rpz_log_rewrite(client, false, st->m.policy, st->m.type, st->m.zone, st->p_name, NULL, st->m.rpz->num); @@ -4840,7 +4865,8 @@ again: dns_rdata_reset(&rdata); optout = ((nsec3.flags & DNS_NSEC3FLAG_OPTOUT) != 0); if (found != NULL && optout && - dns_name_issubdomain(&name, dns_db_origin(db))) { + dns_name_issubdomain(&name, dns_db_origin(db))) + { dns_rdataset_disassociate(rdataset); if (dns_rdataset_isassociated(sigrdataset)) { dns_rdataset_disassociate(sigrdataset); @@ -5343,7 +5369,8 @@ qctx_clean(query_ctx_t *qctx) { dns_rdataset_disassociate(qctx->rdataset); } if (qctx->sigrdataset != NULL && - dns_rdataset_isassociated(qctx->sigrdataset)) { + dns_rdataset_isassociated(qctx->sigrdataset)) + { dns_rdataset_disassociate(qctx->sigrdataset); } if (qctx->db != NULL && qctx->node != NULL) { @@ -5500,7 +5527,8 @@ query_setup(ns_client_t *client, dns_rdatatype_t qtype) { * If it's a SIG query, we'll iterate the node. */ if (qctx.qtype == dns_rdatatype_rrsig || - qctx.qtype == dns_rdatatype_sig) { + qctx.qtype == dns_rdatatype_sig) + { qctx.type = dns_rdatatype_any; } @@ -5905,7 +5933,8 @@ query_lookup(query_ctx_t *qctx) { (void)dns_db_getservestalerefresh(qctx->client->view->cachedb, &stale_refresh); if (stale_refresh > 0 && - dns_view_staleanswerenabled(qctx->client->view)) { + dns_view_staleanswerenabled(qctx->client->view)) + { dboptions |= DNS_DBFIND_STALEENABLED; } @@ -5920,7 +5949,8 @@ query_lookup(query_ctx_t *qctx) { if (qctx->dns64 && qctx->rpz) { dns_name_copy(qctx->client->query.qname, qctx->fname); if (qctx->sigrdataset != NULL && - dns_rdataset_isassociated(qctx->sigrdataset)) { + dns_rdataset_isassociated(qctx->sigrdataset)) + { dns_rdataset_disassociate(qctx->sigrdataset); } } @@ -5971,7 +6001,8 @@ query_lookup(query_ctx_t *qctx) { { stale_found = true; if (result == DNS_R_NCACHENXDOMAIN || - result == DNS_R_NXDOMAIN) { + result == DNS_R_NXDOMAIN) + { ede = DNS_EDE_STALENXANSWER; } else { ede = DNS_EDE_STALEANSWER; @@ -6537,7 +6568,8 @@ query_resume(query_ctx_t *qctx) { qctx->rpz_st = qctx->client->query.rpz_st; if (qctx->rpz_st != NULL && - (qctx->rpz_st->state & DNS_RPZ_RECURSING) != 0) { + (qctx->rpz_st->state & DNS_RPZ_RECURSING) != 0) + { CCTRACE(ISC_LOG_DEBUG(3), "resume from RPZ recursion"); #ifdef WANT_QUERYTRACE { @@ -6631,7 +6663,8 @@ query_resume(query_ctx_t *qctx) { INSIST(qctx->rdataset != NULL); if (qctx->qtype == dns_rdatatype_rrsig || - qctx->qtype == dns_rdatatype_sig) { + qctx->qtype == dns_rdatatype_sig) + { qctx->type = dns_rdatatype_any; } else { qctx->type = qctx->qtype; @@ -6650,7 +6683,8 @@ query_resume(query_ctx_t *qctx) { } if (qctx->rpz_st != NULL && - (qctx->rpz_st->state & DNS_RPZ_RECURSING) != 0) { + (qctx->rpz_st->state & DNS_RPZ_RECURSING) != 0) + { /* * Has response policy changed out from under us? */ @@ -6674,7 +6708,8 @@ query_resume(query_ctx_t *qctx) { qctx->fname = ns_client_newname(qctx->client, qctx->dbuf, &b); if (qctx->rpz_st != NULL && - (qctx->rpz_st->state & DNS_RPZ_RECURSING) != 0) { + (qctx->rpz_st->state & DNS_RPZ_RECURSING) != 0) + { tname = qctx->rpz_st->fname; } else if (REDIRECT(qctx->client)) { tname = qctx->client->query.redirect.fname; @@ -6685,7 +6720,8 @@ query_resume(query_ctx_t *qctx) { dns_name_copy(tname, qctx->fname); if (qctx->rpz_st != NULL && - (qctx->rpz_st->state & DNS_RPZ_RECURSING) != 0) { + (qctx->rpz_st->state & DNS_RPZ_RECURSING) != 0) + { qctx->rpz_st->r.r_result = qctx->event->result; result = qctx->rpz_st->q.result; free_devent(qctx->client, ISC_EVENT_PTR(&qctx->event), @@ -7138,7 +7174,8 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) { qctx->client->message->flags |= DNS_MESSAGEFLAG_TC; if (resp_result == - DNS_R_NXDOMAIN) { + DNS_R_NXDOMAIN) + { qctx->client->message ->rcode = dns_rcode_nxdomain; @@ -7243,7 +7280,8 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { case DNS_RPZ_POLICY_TCP_ONLY: qctx->client->message->flags |= DNS_MESSAGEFLAG_TC; if (result == DNS_R_NXDOMAIN || - result == DNS_R_NCACHENXDOMAIN) { + result == DNS_R_NCACHENXDOMAIN) + { qctx->client->message->rcode = dns_rcode_nxdomain; } @@ -7276,7 +7314,8 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { case DNS_RPZ_POLICY_RECORD: result = qctx->rpz_st->m.result; if (qctx->qtype == dns_rdatatype_any && - result != DNS_R_CNAME) { + result != DNS_R_CNAME) + { /* * We will add all of the rdatasets of * the node by iterating later, @@ -7331,7 +7370,8 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { } if (qctx->rpz_st->m.rpz->ede != 0 && - qctx->rpz_st->m.rpz->ede != UINT16_MAX) { + qctx->rpz_st->m.rpz->ede != UINT16_MAX) + { ns_client_extendederror(qctx->client, qctx->rpz_st->m.rpz->ede, NULL); } @@ -7956,7 +7996,8 @@ query_respond_any(query_ctx_t *qctx) { } if (qctx->qtype == dns_rdatatype_rrsig && - dns_db_issecure(qctx->db)) { + dns_db_issecure(qctx->db)) + { char namebuf[DNS_NAME_FORMATSIZE]; dns_name_format(qctx->client->query.qname, namebuf, sizeof(namebuf)); @@ -8177,7 +8218,8 @@ query_respond(query_ctx_t *qctx) { * the authority section */ if (dns_name_equal(qctx->client->query.qname, - dns_db_origin(qctx->db))) { + dns_db_origin(qctx->db))) + { qctx->answer_has_ns = true; } @@ -9220,7 +9262,8 @@ query_sign_nodata(query_ctx_t *qctx) { return (ns_query_done(qctx)); } if (!dns_rdataset_isassociated(qctx->rdataset) && - WANTDNSSEC(qctx->client)) { + WANTDNSSEC(qctx->client)) + { if (!qctx->fname->attributes.wildcard) { dns_name_t *found; dns_name_t *qname; @@ -9267,7 +9310,8 @@ query_sign_nodata(query_ctx_t *qctx) { fixrdataset(qctx->client, &qctx->sigrdataset); if (qctx->fname == NULL || qctx->rdataset == NULL || - qctx->sigrdataset == NULL) { + qctx->sigrdataset == NULL) + { CCTRACE(ISC_LOG_ERROR, "query_sign_" "nodata: " "failure " @@ -9324,7 +9368,8 @@ query_sign_nodata(query_ctx_t *qctx) { * Add NSEC record if we found one. */ if (WANTDNSSEC(qctx->client) && - dns_rdataset_isassociated(qctx->rdataset)) { + dns_rdataset_isassociated(qctx->rdataset)) + { query_addnxrrsetnsec(qctx); } @@ -9350,7 +9395,8 @@ query_addnxrrsetnsec(query_ctx_t *qctx) { } if (qctx->sigrdataset == NULL || - !dns_rdataset_isassociated(qctx->sigrdataset)) { + !dns_rdataset_isassociated(qctx->sigrdataset)) + { return; } @@ -9441,7 +9487,8 @@ query_nxdomain(query_ctx_t *qctx, isc_result_t res) { ttl = 0; } if (!qctx->nxrewrite || - (qctx->rpz_st != NULL && qctx->rpz_st->m.rpz->addsoa)) { + (qctx->rpz_st != NULL && qctx->rpz_st->m.rpz->addsoa)) + { result = query_addsoa(qctx, ttl, section); if (result != ISC_R_SUCCESS) { QUERY_ERROR(qctx, result); @@ -10050,7 +10097,8 @@ query_coveringnsec(query_ctx_t *qctx) { &rdataset, &sigrdataset); if (rdataset.trust != dns_trust_secure || - sigrdataset.trust != dns_trust_secure) { + sigrdataset.trust != dns_trust_secure) + { goto cleanup; } @@ -10521,7 +10569,8 @@ query_dname(query_ctx_t *qctx) { * CNAME. */ if (qctx->qtype != dns_rdatatype_cname && - qctx->qtype != dns_rdatatype_any) { + qctx->qtype != dns_rdatatype_any) + { /* * Switch to the new qname and restart. */ @@ -10927,7 +10976,8 @@ db_find: client->now, &node, fname, NULL, rdataset, sigrdataset); if (result == ISC_R_SUCCESS) { if (zfname != NULL && - !dns_name_issubdomain(fname, zfname)) { + !dns_name_issubdomain(fname, zfname)) + { /* * We found a zonecut in the cache, but our * zone delegation is better. @@ -11341,7 +11391,8 @@ query_addauth(query_ctx_t *qctx) { (void)query_addns(qctx); } } else if (!qctx->answer_has_ns && - qctx->qtype != dns_rdatatype_ns) { + qctx->qtype != dns_rdatatype_ns) + { if (qctx->fname != NULL) { ns_client_releasename(qctx->client, &qctx->fname); @@ -11403,7 +11454,8 @@ query_setup_sortlist(query_ctx_t *qctx) { isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); switch (ns_sortlist_setup(client->view->sortlist, env, &netaddr, - &order_arg)) { + &order_arg)) + { case NS_SORTLISTTYPE_1ELEMENT: elt = order_arg; dns_message_setsortorder(client->message, @@ -11484,7 +11536,8 @@ ns_query_done(query_ctx_t *qctx) { */ qctx->rpz_st = qctx->client->query.rpz_st; if (qctx->rpz_st != NULL && - (qctx->rpz_st->state & DNS_RPZ_RECURSING) == 0) { + (qctx->rpz_st->state & DNS_RPZ_RECURSING) == 0) + { rpz_match_clear(qctx->rpz_st); qctx->rpz_st->state &= ~DNS_RPZ_DONE_QNAME; } @@ -11516,7 +11569,8 @@ ns_query_done(query_ctx_t *qctx) { qctx->result == DNS_R_DROP)) { if (qctx->result == DNS_R_DUPLICATE || - qctx->result == DNS_R_DROP) { + qctx->result == DNS_R_DROP) + { /* * This was a duplicate query that we are * recursing on or the result of rate limiting. @@ -11958,7 +12012,8 @@ ns_query_start(ns_client_t *client, isc_nmhandle_t *handle) { * Maybe turn on minimal responses for ANY queries. */ if (qtype == dns_rdatatype_any && client->view->minimal_any && - !TCP(client)) { + !TCP(client)) + { client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | NS_QUERYATTR_NOADDITIONAL); } @@ -11981,7 +12036,8 @@ ns_query_start(ns_client_t *client, isc_nmhandle_t *handle) { * disabled as there will be no pending data. */ if ((message->flags & DNS_MESSAGEFLAG_CD) != 0 || - qtype == dns_rdatatype_rrsig) { + qtype == dns_rdatatype_rrsig) + { client->query.dboptions |= DNS_DBFIND_PENDINGOK; client->query.fetchoptions |= DNS_FETCHOPT_NOVALIDATE; } else if (!client->view->enablevalidation) { diff --git a/lib/ns/update.c b/lib/ns/update.c index dfa9be18ee0..11b3ef156d5 100644 --- a/lib/ns/update.c +++ b/lib/ns/update.c @@ -823,7 +823,8 @@ static isc_result_t cname_compatibility_action(void *data, dns_rdataset_t *rrset) { UNUSED(data); if (rrset->type != dns_rdatatype_cname && - !dns_rdatatype_atcname(rrset->type)) { + !dns_rdatatype_atcname(rrset->type)) + { return (ISC_R_EXISTS); } return (ISC_R_SUCCESS); @@ -927,7 +928,8 @@ ssu_checkrule(void *data, dns_rdataset_t *rrset) { * if we're normally not allowed to. */ if (rrset->type == dns_rdatatype_rrsig || - rrset->type == dns_rdatatype_nsec) { + rrset->type == dns_rdatatype_nsec) + { return (ISC_R_SUCCESS); } @@ -1166,7 +1168,8 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, *typep = type = t->rdata.type; if (type == dns_rdatatype_rrsig || - type == dns_rdatatype_sig) { + type == dns_rdatatype_sig) + { covers = dns_rdata_covers(&t->rdata); } else if (type == dns_rdatatype_any) { dns_db_detachnode(db, &node); @@ -1218,7 +1221,8 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, * they are already sorted. */ while (t != NULL && dns_name_equal(&t->name, name) && - t->rdata.type == type) { + t->rdata.type == type) + { dns_difftuple_t *next = ISC_LIST_NEXT(t, link); ISC_LIST_UNLINK(temp->tuples, t, link); ISC_LIST_APPEND(u_rrs.tuples, t, link); @@ -1815,7 +1819,8 @@ remove_orphaned_ds(dns_db_t *db, dns_dbversion_t *newver, dns_diff_t *diff) { CHECK(rrset_exists(db, newver, &tuple->name, dns_rdatatype_ns, 0, &ns_exists)); if (ns_exists && - !dns_name_equal(&tuple->name, dns_db_origin(db))) { + !dns_name_equal(&tuple->name, dns_db_origin(db))) + { continue; } CHECK(delete_if(true_p, db, newver, &tuple->name, @@ -1860,9 +1865,11 @@ check_mx(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, options = dns_zone_getoptions(zone); for (t = ISC_LIST_HEAD(diff->tuples); t != NULL; - t = ISC_LIST_NEXT(t, link)) { + t = ISC_LIST_NEXT(t, link)) + { if (t->op != DNS_DIFFOP_ADD || - t->rdata.type != dns_rdatatype_mx) { + t->rdata.type != dns_rdatatype_mx) + { continue; } @@ -2054,7 +2061,8 @@ try_private: dns_rdataset_current(&rdataset, &rdata); if (!dns_nsec3param_fromprivate(&private, &rdata, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } CHECK(dns_rdata_tostruct(&rdata, &nsec3param, NULL)); @@ -2158,7 +2166,8 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, * delayed changes. */ for (tuple = ISC_LIST_HEAD(temp_diff.tuples); tuple != NULL; - tuple = next) { + tuple = next) + { if (tuple->op == DNS_DIFFOP_ADD) { if (!ttl_good) { /* @@ -2217,7 +2226,8 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, * taking into account any TTL change of the NSEC3PARAM RRset. */ for (tuple = ISC_LIST_HEAD(temp_diff.tuples); tuple != NULL; - tuple = next) { + tuple = next) + { next = ISC_LIST_NEXT(tuple, link); if ((tuple->rdata.data[1] & ~DNS_NSEC3FLAG_OPTOUT) != 0) { /* @@ -2245,7 +2255,8 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, * deletions. */ for (tuple = ISC_LIST_HEAD(temp_diff.tuples); tuple != NULL; - tuple = next) { + tuple = next) + { /* * If we haven't had any adds then the tuple->ttl must be the * original ttl and should be used for any future changes. @@ -2350,7 +2361,8 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, } for (tuple = ISC_LIST_HEAD(temp_diff.tuples); tuple != NULL; - tuple = next) { + tuple = next) + { INSIST(ttl_good); next = ISC_LIST_NEXT(tuple, link); @@ -2410,7 +2422,8 @@ rollback_private(dns_db_t *db, dns_rdatatype_t privatetype, next = ISC_LIST_NEXT(tuple, link); if (tuple->rdata.type != privatetype || - !dns_name_equal(name, &tuple->name)) { + !dns_name_equal(name, &tuple->name)) + { continue; } @@ -2483,7 +2496,8 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype, * Extract TTL changes pairs, we don't need signing records for these. */ for (tuple = ISC_LIST_HEAD(temp_diff.tuples); tuple != NULL; - tuple = next) { + tuple = next) + { if (tuple->op == DNS_DIFFOP_ADD) { /* * Walk the temp_diff list looking for the @@ -2843,7 +2857,8 @@ update_action(isc_task_t *task, isc_event_t *event) { FAIL(DNS_R_REFUSED); } if ((options & DNS_ZONEOPT_CHECKSVCB) != 0 && - rdata.type == dns_rdatatype_svcb) { + rdata.type == dns_rdatatype_svcb) + { result = dns_rdata_checksvcb(name, &rdata); if (result != ISC_R_SUCCESS) { const char *reason = @@ -2884,7 +2899,8 @@ update_action(isc_task_t *task, isc_event_t *event) { "allowed " "in secure zones"); } else if (rdata.type == dns_rdatatype_rrsig && - !dns_name_equal(name, zonename)) { + !dns_name_equal(name, zonename)) + { FAILC(DNS_R_REFUSED, "explicit RRSIG updates are " "currently " "not supported in secure zones " @@ -2946,7 +2962,8 @@ update_action(isc_task_t *task, isc_event_t *event) { "rejected by secure update"); } } else if (target != NULL && - update_class == dns_rdataclass_none) { + update_class == dns_rdataclass_none) + { bool flag; CHECK(rr_exists(db, ver, name, &rdata, &flag)); if (flag && @@ -3013,7 +3030,8 @@ update_action(isc_task_t *task, isc_event_t *event) { * RFC1123 doesn't allow MF and MD in master files. */ if (rdata.type == dns_rdatatype_md || - rdata.type == dns_rdatatype_mf) { + rdata.type == dns_rdatatype_mf) + { char typebuf[DNS_RDATATYPE_FORMATSIZE]; dns_rdatatype_format(rdata.type, typebuf, @@ -3087,7 +3105,8 @@ update_action(isc_task_t *task, isc_event_t *event) { } if (dns_rdatatype_atparent(rdata.type) && - dns_name_equal(name, zonename)) { + dns_name_equal(name, zonename)) + { char typebuf[DNS_RDATATYPE_FORMATSIZE]; dns_rdatatype_format(rdata.type, typebuf, @@ -3114,7 +3133,8 @@ update_action(isc_task_t *task, isc_event_t *event) { * with any flags other than OPTOUT. */ if ((rdata.data[1] & ~DNS_NSEC3FLAG_OPTOUT) != - 0) { + 0) + { update_log(client, zone, LOGLEVEL_PROTOCOL, "attempt to add NSEC3PARAM " @@ -3237,7 +3257,8 @@ update_action(isc_task_t *task, isc_event_t *event) { } else if (update_class == dns_rdataclass_any) { if (rdata.type == dns_rdatatype_any) { if (isc_log_wouldlog(ns_lctx, - LOGLEVEL_PROTOCOL)) { + LOGLEVEL_PROTOCOL)) + { char namestr[DNS_NAME_FORMATSIZE]; dns_name_format(name, namestr, sizeof(namestr)); @@ -3268,7 +3289,8 @@ update_action(isc_task_t *task, isc_event_t *event) { continue; } else { if (isc_log_wouldlog(ns_lctx, - LOGLEVEL_PROTOCOL)) { + LOGLEVEL_PROTOCOL)) + { char namestr[DNS_NAME_FORMATSIZE]; char typestr[DNS_RDATATYPE_FORMATSIZE]; dns_name_format(name, namestr, diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c index d2c059a35bd..83494a3f5b4 100644 --- a/lib/ns/xfrout.c +++ b/lib/ns/xfrout.c @@ -137,7 +137,8 @@ log_rr(dns_name_t *name, dns_rdata_t *rdata, uint32_t ttl) { rdl.rdclass = rdata->rdclass; rdl.ttl = ttl; if (rdata->type == dns_rdatatype_sig || - rdata->type == dns_rdatatype_rrsig) { + rdata->type == dns_rdatatype_rrsig) + { rdl.covers = dns_rdata_covers(rdata); } else { rdl.covers = dns_rdatatype_none; @@ -1483,7 +1484,8 @@ sendstream(xfrout_ctx_t *xfr) { msgrdl->rdclass = rdata->rdclass; msgrdl->ttl = ttl; if (rdata->type == dns_rdatatype_sig || - rdata->type == dns_rdatatype_rrsig) { + rdata->type == dns_rdatatype_rrsig) + { msgrdl->covers = dns_rdata_covers(rdata); } else { msgrdl->covers = dns_rdatatype_none; diff --git a/tests/dns/dispatch_test.c b/tests/dns/dispatch_test.c index 16a104e0327..4e3ef2fd638 100644 --- a/tests/dns/dispatch_test.c +++ b/tests/dns/dispatch_test.c @@ -184,7 +184,8 @@ setup_test(void **state) { tls_tlsctx_client_cache = isc_tlsctx_cache_new(mctx); if (isc_tlsctx_createserver(NULL, NULL, &tls_listen_tlsctx) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { return (-1); } diff --git a/tests/isc/netmgr_common.c b/tests/isc/netmgr_common.c index 2324555a6a2..cf3351e21e9 100644 --- a/tests/isc/netmgr_common.c +++ b/tests/isc/netmgr_common.c @@ -176,7 +176,8 @@ setup_netmgr_test(void **state) { noanswer = false; if (isc_tlsctx_createserver(NULL, NULL, &tcp_listen_tlsctx) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { return (-1); } if (isc_tlsctx_createclient(&tcp_connect_tlsctx) != ISC_R_SUCCESS) { diff --git a/tests/isc/random_test.c b/tests/isc/random_test.c index 1651dbba748..b9914f6a216 100644 --- a/tests/isc/random_test.c +++ b/tests/isc/random_test.c @@ -327,7 +327,8 @@ random_test(pvalue_func_t *func, isc_random_func test_func) { uniform_values = (uint16_t *)values; for (i = 0; i < (sizeof(values) / (sizeof(*uniform_values))); - i++) { + i++) + { uniform_values[i] = isc_random_uniform(UINT16_MAX); } diff --git a/tests/isc/udp_test.c b/tests/isc/udp_test.c index 81340a21747..c72869ffcaf 100644 --- a/tests/isc/udp_test.c +++ b/tests/isc/udp_test.c @@ -860,7 +860,8 @@ udp__connect_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) { switch (eresult) { case ISC_R_SUCCESS: if (have_expected_cconnects(atomic_fetch_add(&cconnects, 1) + - 1)) { + 1)) + { do_cconnects_shutdown(loopmgr); } else if (do_send) { isc_job_run(loopmgr, udp__connect, cbarg); diff --git a/tests/libtest/dns.c b/tests/libtest/dns.c index c292106ae67..e718b9e39e0 100644 --- a/tests/libtest/dns.c +++ b/tests/libtest/dns.c @@ -286,7 +286,8 @@ dns_test_getdata(const char *file, unsigned char *buf, size_t bufsiz, break; } if (*rp != ' ' && *rp != '\t' && *rp != '\r' && - *rp != '\n') { + *rp != '\n') + { *wp++ = *rp; len++; } diff --git a/tests/libtest/ns.c b/tests/libtest/ns.c index 3b4bf7ba5dd..3c813fc6bac 100644 --- a/tests/libtest/ns.c +++ b/tests/libtest/ns.c @@ -596,7 +596,8 @@ ns_test_getdata(const char *file, unsigned char *buf, size_t bufsiz, break; } if (*rp != ' ' && *rp != '\t' && *rp != '\r' && - *rp != '\n') { + *rp != '\n') + { *wp++ = *rp; len++; } diff --git a/tests/ns/query_test.c b/tests/ns/query_test.c index 0e95af3fc0a..786ae78b344 100644 --- a/tests/ns/query_test.c +++ b/tests/ns/query_test.c @@ -914,7 +914,8 @@ run_hookasync_test(const ns__query_hookasync_test_params_t *test) { * query_error. */ if (test->start_result != ISC_R_SUCCESS || !test->quota_ok || - test->do_cancel) { + test->do_cancel) + { expect_servfail = true; isc_nmhandle_attach(qctx->client->handle, &qctx->client->reqhandle);