From 6fac8ef4be769bb06b7351eca865196f34f7bc76 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 8 Sep 2022 20:47:09 +0200 Subject: [PATCH 1/2] Update clang to version 15 (cherry picked from commit 26a42ed1acdc303b136d2b289de1a67fd8364212) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a08ba81b76..14ad716446 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ variables: TEST_PARALLEL_JOBS: 6 CONFIGURE: ./configure - CLANG_VERSION: 14 + CLANG_VERSION: 15 CLANG: "clang-${CLANG_VERSION}" SCAN_BUILD: "scan-build-${CLANG_VERSION}" ASAN_SYMBOLIZER_PATH: "/usr/lib/llvm-${CLANG_VERSION}/bin/llvm-symbolizer" From 1d7d504338307850ee5ab4f402941365d453905f Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Tue, 29 Nov 2022 09:14:07 +0100 Subject: [PATCH 2/2] Update sources to Clang 15 formatting --- bin/check/check-tool.c | 9 +- bin/check/named-checkzone.c | 6 +- bin/confgen/tsig-keygen.c | 3 +- bin/delv/delv.c | 27 +- bin/dig/dig.c | 27 +- bin/dig/dighost.c | 36 ++- bin/dig/host.c | 21 +- bin/dnssec/dnssec-cds.c | 15 +- bin/dnssec/dnssec-keyfromlabel.c | 6 +- bin/dnssec/dnssec-keygen.c | 15 +- bin/dnssec/dnssec-revoke.c | 3 +- bin/dnssec/dnssec-settime.c | 6 +- bin/dnssec/dnssec-signzone.c | 69 +++-- bin/dnssec/dnssectool.c | 6 +- bin/named/builtin.c | 3 +- bin/named/config.c | 12 +- bin/named/controlconf.c | 6 +- bin/named/log.c | 3 +- bin/named/main.c | 9 +- bin/named/server.c | 135 ++++++---- bin/named/statschannel.c | 12 +- bin/named/transportconf.c | 3 +- bin/named/tsigconf.c | 3 +- bin/named/zoneconf.c | 12 +- bin/nsupdate/nsupdate.c | 18 +- bin/plugins/filter-a.c | 6 +- bin/plugins/filter-aaaa.c | 3 +- bin/rndc/rndc.c | 12 +- bin/tests/system/dlzexternal/driver/driver.c | 6 +- bin/tests/system/dyndb/driver/db.c | 6 +- bin/tests/system/resolve.c | 9 +- bin/tests/system/rpz/dnsrps.c | 3 +- bin/tests/wire_test.c | 3 +- bin/tools/mdig.c | 12 +- .../dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c | 6 +- .../filesystem/dlz_filesystem_dynamic.c | 18 +- contrib/dlz/modules/perl/dlz_perl_driver.c | 9 +- .../modules/wildcard/dlz_wildcard_dynamic.c | 9 +- doc/misc/cfg_test.c | 6 +- lib/bind9/check.c | 141 ++++++---- lib/bind9/getaddresses.c | 3 +- lib/dns/adb.c | 21 +- lib/dns/badcache.c | 3 +- lib/dns/byaddr.c | 3 +- lib/dns/catz.c | 33 ++- lib/dns/client.c | 6 +- lib/dns/compress.c | 6 +- lib/dns/db.c | 3 +- lib/dns/diff.c | 27 +- lib/dns/dispatch.c | 9 +- lib/dns/dnsrps.c | 6 +- lib/dns/dnssec.c | 57 +++-- lib/dns/dst_api.c | 6 +- lib/dns/dst_parse.c | 3 +- lib/dns/ecs.c | 3 +- lib/dns/forward.c | 6 +- lib/dns/gen.c | 4 +- lib/dns/hmac_link.c | 3 +- lib/dns/journal.c | 30 ++- lib/dns/key.c | 6 +- lib/dns/keymgr.c | 45 ++-- lib/dns/master.c | 48 ++-- lib/dns/masterdump.c | 21 +- lib/dns/message.c | 51 ++-- lib/dns/name.c | 6 +- lib/dns/ncache.c | 6 +- lib/dns/nsec.c | 6 +- lib/dns/nsec3.c | 21 +- lib/dns/openssl_link.c | 3 +- lib/dns/openssldh_link.c | 15 +- lib/dns/opensslecdsa_link.c | 12 +- lib/dns/openssleddsa_link.c | 6 +- lib/dns/opensslrsa_link.c | 15 +- lib/dns/order.c | 3 +- lib/dns/peer.c | 6 +- lib/dns/private.c | 15 +- lib/dns/rbt.c | 24 +- lib/dns/rbtdb.c | 195 +++++++++----- lib/dns/rcode.c | 3 +- lib/dns/rdata.c | 24 +- lib/dns/rdata/any_255/tsig_250.c | 3 +- lib/dns/rdata/generic/amtrelay_260.c | 3 +- lib/dns/rdata/generic/caa_257.c | 3 +- lib/dns/rdata/generic/isdn_20.c | 3 +- lib/dns/rdata/generic/key_25.c | 3 +- lib/dns/rdata/generic/loc_29.c | 15 +- lib/dns/rdata/generic/tkey_249.c | 3 +- lib/dns/rdata/generic/txt_16.c | 3 +- lib/dns/rdata/in_1/a_1.c | 3 +- lib/dns/rdata/in_1/aaaa_28.c | 3 +- lib/dns/rdata/in_1/svcb_64.c | 27 +- lib/dns/rdatalist.c | 18 +- lib/dns/rdataset.c | 3 +- lib/dns/rdataslab.c | 3 +- lib/dns/request.c | 3 +- lib/dns/resolver.c | 174 ++++++++----- lib/dns/rootns.c | 6 +- lib/dns/rpz.c | 24 +- lib/dns/rrl.c | 18 +- lib/dns/sdb.c | 9 +- lib/dns/sdlz.c | 15 +- lib/dns/ssu.c | 36 ++- lib/dns/stats.c | 15 +- lib/dns/tkey.c | 3 +- lib/dns/tsig.c | 21 +- lib/dns/update.c | 18 +- lib/dns/validator.c | 45 ++-- lib/dns/view.c | 30 ++- lib/dns/xfrin.c | 24 +- lib/dns/zone.c | 240 ++++++++++++------ lib/dns/zonekey.c | 3 +- lib/dns/zoneverify.c | 21 +- lib/dns/zt.c | 6 +- lib/isc/app.c | 3 +- lib/isc/file.c | 3 +- lib/isc/heap.c | 3 +- lib/isc/ht.c | 9 +- lib/isc/lex.c | 54 ++-- lib/isc/log.c | 30 ++- lib/isc/mem.c | 9 +- lib/isc/netaddr.c | 3 +- lib/isc/netmgr/http.c | 24 +- lib/isc/netmgr/netmgr.c | 15 +- lib/isc/netmgr/tcp.c | 21 +- lib/isc/netmgr/tcpdns.c | 15 +- lib/isc/netmgr/tlsdns.c | 24 +- lib/isc/netmgr/tlsstream.c | 12 +- lib/isc/netmgr/udp.c | 15 +- lib/isc/picohttpparser.c | 15 +- lib/isc/radix.c | 6 +- lib/isc/rwlock.c | 12 +- lib/isc/task.c | 12 +- lib/isc/timer.c | 3 +- lib/isc/tls.c | 15 +- lib/isc/url.c | 3 +- lib/isc/utf8.c | 3 +- lib/isccc/alist.c | 3 +- lib/isccc/cc.c | 6 +- lib/isccc/symtab.c | 12 +- lib/isccfg/aclconf.c | 33 ++- lib/isccfg/kaspconf.c | 3 +- lib/isccfg/namedconf.c | 18 +- lib/isccfg/parser.c | 27 +- lib/ns/hooks.c | 3 +- lib/ns/interfacemgr.c | 24 +- lib/ns/listenlist.c | 3 +- lib/ns/query.c | 162 ++++++++---- lib/ns/update.c | 69 +++-- lib/ns/xfrout.c | 6 +- tests/isc/netmgr_test.c | 3 +- tests/isc/random_test.c | 3 +- tests/isc/task_test.c | 6 +- tests/libtest/dns.c | 3 +- tests/libtest/ns.c | 3 +- tests/ns/query_test.c | 3 +- 155 files changed, 1986 insertions(+), 994 deletions(-) diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index ae100966c5..fd008dcfd0 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 4814323f0b..5c74660c0c 100644 --- a/bin/check/named-checkzone.c +++ b/bin/check/named-checkzone.c @@ -472,7 +472,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); } @@ -511,7 +512,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 f6c5b2e272..b44f1a9158 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 32a010a463..e1e9e7fe3d 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -458,7 +458,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; } @@ -482,7 +483,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)); @@ -1443,7 +1447,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; @@ -1522,7 +1527,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; } @@ -1560,13 +1566,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++; } @@ -1585,7 +1593,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 f8eef3f54a..43c1a8c9dd 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -701,7 +701,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; } @@ -1801,7 +1802,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; } @@ -2077,7 +2079,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; @@ -2418,7 +2421,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; } } @@ -2491,7 +2495,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); @@ -2673,7 +2678,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"); @@ -2765,7 +2771,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 " @@ -2805,7 +2812,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 = @@ -2813,7 +2821,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 f7bb1c90ce..638e83b0a6 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -497,7 +497,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; @@ -1936,7 +1937,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; } @@ -1957,7 +1959,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; @@ -2808,7 +2811,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); @@ -2884,7 +2888,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); @@ -2974,7 +2979,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; @@ -3040,7 +3046,8 @@ start_tcp(dig_query_t *query) { if (!specified_source) { if ((isc_sockaddr_pf(&query->sockaddr) == AF_INET) && - have_ipv4) { + have_ipv4) + { isc_sockaddr_any(&localaddr); } else { isc_sockaddr_any6(&localaddr); @@ -3736,13 +3743,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"); @@ -4312,7 +4321,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); } @@ -4444,7 +4454,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), @@ -4679,7 +4690,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 7b6acade27..6debe59660 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); @@ -596,10 +598,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; @@ -710,7 +714,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, @@ -729,7 +734,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; @@ -773,7 +779,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 2c5590df82..9f6ea44772 100644 --- a/bin/dnssec/dnssec-cds.c +++ b/bin/dnssec/dnssec-cds.c @@ -636,7 +636,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", @@ -1085,7 +1086,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 { @@ -1177,7 +1179,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); } @@ -1200,7 +1203,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); } @@ -1208,7 +1212,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 4d66f8f22b..53ca718784 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 890b4225ec..3d77976fab 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 adf3de6fff..93ee20cca2 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 1a4f20218f..100ff88fad 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 afe4797b0e..fde3c86298 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -362,7 +362,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))) @@ -564,7 +565,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 - " @@ -575,7 +577,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); @@ -676,7 +679,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; } @@ -698,7 +702,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)) { @@ -709,7 +714,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"); } @@ -750,7 +756,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; } @@ -1203,7 +1210,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) { @@ -1352,7 +1360,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)); } @@ -1433,7 +1442,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. */ @@ -1648,10 +1658,12 @@ assignwork(isc_task_t *task, isc_task_t *worker) { !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)) { @@ -1813,12 +1825,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."); } @@ -2265,7 +2279,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( @@ -2432,14 +2447,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; @@ -2573,10 +2590,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; @@ -2754,7 +2773,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)) { @@ -3095,7 +3115,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; } @@ -3768,7 +3789,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); } @@ -3874,7 +3896,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 ffe0978d79..c07e091266 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -313,7 +313,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)); @@ -329,7 +330,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 db8435788a..cf18030d1e 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 4c956a72a5..0dcc814c25 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -396,7 +396,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. */ @@ -412,7 +413,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); @@ -485,7 +487,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; @@ -623,7 +626,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 9deaf39ee4..d40215516a 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -470,7 +470,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; } @@ -914,7 +915,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 ff76c36a7a..6efea02d6d 100644 --- a/bin/named/log.c +++ b/bin/named/log.c @@ -198,7 +198,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 c496bfb587..383ef81ece 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -439,7 +439,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; } @@ -493,14 +494,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 7a44046eba..d575b8431f 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -970,7 +970,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", @@ -1012,7 +1013,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)); } @@ -1080,7 +1082,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); } @@ -2063,7 +2066,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; } } @@ -2209,7 +2213,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)); } @@ -2286,7 +2291,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); @@ -2329,9 +2335,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); @@ -2627,10 +2635,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) @@ -2690,7 +2700,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: " @@ -2773,7 +2784,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 " @@ -3494,7 +3506,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) { @@ -3544,7 +3557,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) { @@ -4678,7 +4692,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, @@ -4806,7 +4821,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; } @@ -9033,7 +9054,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"); } @@ -9696,7 +9718,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; } first = false; @@ -9707,7 +9730,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)); @@ -10120,14 +10144,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); if (flush) { @@ -10193,7 +10219,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); @@ -10604,7 +10631,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); } @@ -11066,10 +11094,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); } } @@ -11143,12 +11173,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); @@ -11170,12 +11202,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); } @@ -11358,7 +11392,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); } @@ -11375,7 +11410,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); @@ -12794,7 +12830,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); } @@ -12837,7 +12874,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 { @@ -12965,7 +13003,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 { @@ -13103,7 +13142,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)); @@ -13807,7 +13847,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; @@ -14701,7 +14742,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"); @@ -14915,7 +14957,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) { @@ -14959,7 +15002,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); } @@ -15550,7 +15594,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 4159b2cb33..cd56029245 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -1463,7 +1463,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; @@ -1535,7 +1536,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) @@ -2238,7 +2240,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)) + { TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "view")); TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "name", ISC_XMLCHAR view->name)); @@ -2720,7 +2723,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 8d3153c772..f24aab11dd 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 1957fecc7b..6d596ab27f 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 3d48249c14..2068edc273 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); } @@ -1017,7 +1020,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 933a05602f..bde0b239ac 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -860,7 +860,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) { @@ -882,7 +883,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) { @@ -1916,7 +1918,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)); @@ -2182,7 +2185,8 @@ 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, "gsstsig") == 0) { @@ -2640,7 +2644,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"); } @@ -3131,7 +3136,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 2ba52df081..295ceb5474 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 7f6fac12ac..f9ed9fe9cf 100644 --- a/bin/plugins/filter-aaaa.c +++ b/bin/plugins/filter-aaaa.c @@ -622,7 +622,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 c292a66dbf..ebb7adec2f 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -689,7 +689,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( @@ -726,7 +727,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); @@ -941,11 +943,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 b8c74244e6..20edfd03e4 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 a2bdb6916b..fed0107557 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/resolve.c b/bin/tests/system/resolve.c index d563d92d8b..3142757d58 100644 --- a/bin/tests/system/resolve.c +++ b/bin/tests/system/resolve.c @@ -293,7 +293,8 @@ main(int argc, char *argv[]) { isc_sockaddr_t *addr4 = NULL, *addr6 = NULL; while ((ch = isc_commandline_parse(argc, argv, "a:b:es:t:k:K:p:S:")) != - -1) { + -1) + { switch (ch) { case 't': tr.base = isc_commandline_argument; @@ -310,7 +311,8 @@ main(int argc, char *argv[]) { break; case 'b': if (inet_pton(AF_INET, isc_commandline_argument, - &in4) == 1) { + &in4) == 1) + { if (addr4 != NULL) { fprintf(stderr, "only one local " "address per family " @@ -320,7 +322,8 @@ main(int argc, char *argv[]) { isc_sockaddr_fromin(&a4, &in4, 0); addr4 = &a4; } else if (inet_pton(AF_INET6, isc_commandline_argument, - &in6) == 1) { + &in6) == 1) + { if (addr6 != NULL) { fprintf(stderr, "only one local " "address per family " diff --git a/bin/tests/system/rpz/dnsrps.c b/bin/tests/system/rpz/dnsrps.c index 4f8890873d..55d8a9106c 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 5dcc0951f7..5b079ce3ea 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 b0bb6d122e..7474e885e7 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -474,7 +474,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"); @@ -1887,7 +1888,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; } @@ -1974,13 +1976,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 4c7c81003e..e84f866136 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 34aa26ba94..3b8a8bbc68 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 88edc0ced0..b99b296e99 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 df22eaf688..95221a1e5e 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 661981f8ed..d5f36549e2 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 3811e454f2..f51dd3d6b3 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -144,7 +144,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) { @@ -480,14 +481,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; } } @@ -3511,7 +3532,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 " @@ -3537,7 +3559,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 " @@ -3548,7 +3571,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 " @@ -3583,7 +3607,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; } @@ -3641,7 +3666,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 " @@ -3905,7 +3931,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]", @@ -3924,7 +3951,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]", @@ -4513,7 +4541,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. */ @@ -4569,7 +4598,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. */ @@ -4614,7 +4644,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); @@ -4677,7 +4708,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; @@ -4733,7 +4765,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); @@ -4801,7 +4834,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); @@ -4816,7 +4850,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); @@ -4831,7 +4866,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); @@ -4841,7 +4877,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); @@ -4855,7 +4892,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) { @@ -4864,7 +4902,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) { @@ -5024,7 +5063,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 " @@ -5254,7 +5294,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; } @@ -5306,7 +5347,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; } @@ -5419,7 +5461,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 " @@ -5827,7 +5870,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; } @@ -5990,14 +6034,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, @@ -6013,7 +6059,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 6ce32d7a9b..5fa77704fe 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 28c61de5e0..6c39e9591f 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -2207,7 +2207,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; } @@ -2242,7 +2243,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; } @@ -2836,7 +2838,8 @@ dns_adb_shutdown(dns_adb_t *adb) { LOCK(&adb->lock); if (atomic_compare_exchange_strong(&adb->shutting_down, - &(bool){ false }, true)) { + &(bool){ false }, true)) + { isc_mem_clearwater(adb->mctx); /* * Isolate shutdown_names and shutdown_entries calls. @@ -3616,7 +3619,8 @@ print_namehook_list(FILE *f, const char *legend, dns_adb_t *adb, dns_adbnamehook_t *nh; 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); } @@ -3839,7 +3843,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; @@ -4094,7 +4099,8 @@ dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, LOCK(&adb->entrylocks[bucket]); 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) { @@ -4603,7 +4609,8 @@ dns_adb_flushnames(dns_adb_t *adb, const dns_name_t *name) { bool ret; nextname = ISC_LIST_NEXT(adbname, plink); if (!NAME_DEAD(adbname) && - dns_name_issubdomain(&adbname->name, name)) { + dns_name_issubdomain(&adbname->name, name)) + { ret = kill_name(&adbname, DNS_EVENT_ADBCANCELED); RUNTIME_CHECK(!ret); diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c index a0f52ec3cc..dcad721b62 100644 --- a/lib/dns/badcache.c +++ b/lib/dns/badcache.c @@ -271,7 +271,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/byaddr.c b/lib/dns/byaddr.c index b913cd3f14..8fa668a1b2 100644 --- a/lib/dns/byaddr.c +++ b/lib/dns/byaddr.c @@ -176,7 +176,8 @@ bevent_destroy(isc_event_t *event) { bevent = (dns_byaddrevent_t *)event; for (name = ISC_LIST_HEAD(bevent->names); name != NULL; - name = next_name) { + name = next_name) + { next_name = ISC_LIST_NEXT(name, link); ISC_LIST_UNLINK(bevent->names, name, link); dns_name_free(name, mctx); diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 7339ef1c7b..7523eea5db 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -363,28 +363,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); } } @@ -405,7 +409,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); } @@ -571,7 +576,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); } @@ -580,7 +586,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 @@ -1012,7 +1019,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); @@ -1045,7 +1053,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); @@ -1059,7 +1068,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); @@ -1426,7 +1436,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 bf8d69c559..294223922c 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -804,7 +804,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) { @@ -863,7 +864,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 583a0eab68..1460e0c329 100644 --- a/lib/dns/compress.c +++ b/lib/dns/compress.c @@ -260,7 +260,8 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, i = tableindex[ch]; if ((cctx->allowed & DNS_COMPRESS_CASESENSITIVE) != 0) { for (node = cctx->table[i]; node != NULL; - node = node->next) { + node = node->next) + { if (node->name.length != length) { continue; } @@ -271,7 +272,8 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, } } else { for (node = cctx->table[i]; node != NULL; - node = node->next) { + node = node->next) + { unsigned int l, count; unsigned char c; unsigned char *label1, *label2; diff --git a/lib/dns/db.c b/lib/dns/db.c index 9d894ccd7a..0b19b2a8f0 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 a1a2c438d3..52f5aca67c 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 8bc07b34d8..115cc78476 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -371,7 +371,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); @@ -1212,7 +1213,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); @@ -1533,7 +1535,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 30b7052b3e..0a82059d02 100644 --- a/lib/dns/dnsrps.c +++ b/lib/dns/dnsrps.c @@ -473,7 +473,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); } @@ -707,7 +708,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 9dda841f98..97003a9afa 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); @@ -1452,7 +1454,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; } @@ -1552,7 +1555,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), @@ -1610,7 +1614,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); @@ -1682,7 +1687,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; } @@ -1974,7 +1980,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; @@ -2010,7 +2017,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, @@ -2021,7 +2029,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, @@ -2081,7 +2090,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); } @@ -2089,7 +2099,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; @@ -2174,7 +2185,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 " @@ -2197,7 +2209,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 " @@ -2208,7 +2221,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 " @@ -2250,7 +2264,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)) { @@ -2271,10 +2286,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; } } @@ -2422,7 +2439,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, @@ -2431,7 +2449,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 c13463ffd1..56bd9b657d 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -1227,7 +1227,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); } } @@ -2251,7 +2252,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 590591b9a0..901b890d47 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 8dbf720f64..676c740af5 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 9fe4d262ae..270dbd41ed 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 e96a0adafb..7cbdf0a6c2 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -137,7 +137,7 @@ static struct cc { struct cc *next; int 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 6111d21e3c..4a753fd60d 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 930fae3c73..725510380f 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -866,7 +866,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( @@ -878,7 +879,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", @@ -973,7 +975,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", @@ -1203,7 +1206,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 = @@ -1233,7 +1237,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. */ @@ -1345,7 +1350,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); @@ -1890,7 +1896,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); } @@ -2642,7 +2649,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; @@ -2696,7 +2704,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); } @@ -2785,7 +2794,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 e4afa88ddb..7d4f378e69 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 024107a893..6457d97c4e 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); } @@ -2040,7 +2051,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, @@ -2087,7 +2099,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); @@ -2121,7 +2134,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; } } @@ -2139,7 +2153,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 6acd19232f..2e91301437 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -367,7 +367,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; @@ -883,7 +884,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)); /* @@ -1199,7 +1201,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) { @@ -1233,7 +1236,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); } @@ -1299,7 +1303,8 @@ load_text(dns_loadctx_t *lctx) { EXPECTEOL; continue; } else if (strcasecmp(DNS_AS_STR(token), "$GENERATE") == - 0) { + 0) + { /* * Lazy cleanup. */ @@ -1336,7 +1341,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; @@ -1359,7 +1365,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", @@ -1373,7 +1380,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; } /* @@ -1477,7 +1485,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); @@ -1508,7 +1517,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; @@ -1544,13 +1554,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)); @@ -1833,7 +1845,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); @@ -2063,7 +2076,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 " @@ -2490,7 +2504,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 " @@ -2521,7 +2536,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 505de8394c..248401ec78 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -664,7 +664,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 { @@ -697,7 +698,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); @@ -706,7 +708,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 { @@ -932,7 +935,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; @@ -1736,7 +1742,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 5d71c6ae99..1b983d9194 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -822,7 +822,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; } @@ -1328,7 +1329,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); } } @@ -1356,7 +1358,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; @@ -1394,7 +1397,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 || @@ -1409,7 +1413,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); } } @@ -1433,7 +1438,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; @@ -1464,7 +1470,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 { /* @@ -2056,7 +2063,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; } @@ -2264,7 +2272,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); } @@ -3090,7 +3099,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); @@ -3238,7 +3248,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); @@ -3346,13 +3357,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; @@ -3811,7 +3824,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 { @@ -4167,7 +4181,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 { @@ -4634,7 +4649,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; } @@ -4748,7 +4764,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 544dbe2b92..8a258a2a2a 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -833,7 +833,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); } @@ -1417,7 +1418,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 7bea3d376c..9247ac1565 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; @@ -641,7 +642,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 d2b8a7beb3..4477ef6b8b 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 ca60b12c5f..dfe931812c 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 { @@ -1311,7 +1314,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)); @@ -1740,7 +1744,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)); @@ -1858,7 +1863,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); @@ -1966,7 +1972,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 a3f63885fa..c08070717a 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 7df483f72b..00950b708b 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) { @@ -463,14 +465,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)); @@ -529,7 +533,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 f04f076e42..3422f3beba 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 fa8d51b1ef..f89672b26e 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 2c5b967aa1..d1546633b1 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); } } @@ -1306,15 +1307,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 && @@ -1363,7 +1367,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 b3112d32dd..477576c9e7 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 bac2624e09..2a722592ea 100644 --- a/lib/dns/peer.c +++ b/lib/dns/peer.c @@ -185,7 +185,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; } @@ -210,7 +211,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 cbf947f8cc..56573b3a41 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 0bdaaf8a8a..57dcd54542 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -701,7 +701,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 @@ -776,7 +777,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 && DATA(node) == NULL)) { + (result == ISC_R_EXISTS && DATA(node) == NULL)) + { DATA(node) = data; result = ISC_R_SUCCESS; } @@ -1293,7 +1295,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) { /* @@ -1728,7 +1731,8 @@ maybe_rehash(dns_rbt_t *rbt, size_t newcount) { uint32_t newbits = rehash_bits(rbt, newcount); if (rbt->hashbits[rbt->hindex] < newbits && - newbits <= RBT_HASH_MAX_BITS) { + newbits <= RBT_HASH_MAX_BITS) + { hashtable_rehash(rbt, newbits); } } @@ -2153,7 +2157,8 @@ deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) { INSIST(sibling != NULL); if (IS_BLACK(LEFT(sibling)) && - IS_BLACK(RIGHT(sibling))) { + IS_BLACK(RIGHT(sibling))) + { MAKE_RED(sibling); child = parent; } else { @@ -2189,7 +2194,8 @@ deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) { INSIST(sibling != NULL); if (IS_BLACK(LEFT(sibling)) && - IS_BLACK(RIGHT(sibling))) { + IS_BLACK(RIGHT(sibling))) + { MAKE_RED(sibling); child = parent; } else { @@ -2340,7 +2346,8 @@ check_properties_helper(dns_rbtnode_t *node) { * a subtree root and must have the flag set. */ if (((!PARENT(node)) || (DOWN(PARENT(node)) == node)) && - (!IS_ROOT(node))) { + (!IS_ROOT(node))) + { return (false); } @@ -2748,7 +2755,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 || OFFSETLEN(predecessor) > 1)) { + (chain->level_count > 0 || OFFSETLEN(predecessor) > 1)) + { new_origin = true; } } diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index ea3c005d35..591ef98e3f 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -1478,7 +1478,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); @@ -1618,11 +1619,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; } @@ -1673,7 +1676,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; @@ -1867,7 +1871,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; @@ -2296,7 +2301,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; } @@ -2307,7 +2313,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. */ @@ -2578,7 +2585,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_LIST_UNLINK(resigned_list, header, link); @@ -2619,7 +2627,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; next_changed = NEXT(changed, link); @@ -2861,7 +2870,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? @@ -2878,10 +2888,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 @@ -2900,7 +2912,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. @@ -3240,7 +3253,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; } } @@ -3308,7 +3322,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; } } @@ -3338,7 +3353,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; } } @@ -3485,7 +3501,8 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep, lock = &rbtdb->node_locks[wnode->locknum].lock; NODE_LOCK(lock, isc_rwlocktype_read); for (header = wnode->data; header != NULL; - header = header->next) { + header = header->next) + { if (header->serial <= search->serial && !IGNORE(header) && EXISTS(header) && !ANCIENT(header)) @@ -3495,9 +3512,11 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep, } NODE_UNLOCK(lock, isc_rwlocktype_read); if (header != NULL || - activeempty(search, &wchain, wname)) { + activeempty(search, &wchain, wname)) + { if (activeemptynode(search, qname, - wname)) { + wname)) + { return (ISC_R_NOTFOUND); } /* @@ -3510,7 +3529,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. */ @@ -3636,7 +3656,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) { @@ -3751,7 +3772,8 @@ again: */ do { if (header->serial <= search->serial && - !IGNORE(header)) { + !IGNORE(header)) + { /* * Is this a "this rdataset doesn't * exist" record? @@ -3795,7 +3817,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. * @@ -4144,7 +4167,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, isc_rwlocktype_read); goto partial_match; } @@ -4160,7 +4184,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. @@ -4195,7 +4220,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 @@ -4211,7 +4237,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. @@ -4278,7 +4305,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. @@ -4458,7 +4486,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; /* @@ -4488,7 +4517,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. @@ -4581,7 +4611,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, &locktype, lock, search, - &header_prev)) { + &header_prev)) + { /* Do nothing. */ } else if (header->type == dns_rdatatype_dname && EXISTS(header) && !ANCIENT(header)) @@ -4658,7 +4689,8 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, { header_next = header->next; if (check_stale_header(node, header, &locktype, lock, - search, &header_prev)) { + search, &header_prev)) + { /* Do nothing. */ } else if (EXISTS(header) && !ANCIENT(header)) { /* @@ -4671,7 +4703,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; @@ -4739,7 +4772,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); } @@ -4836,11 +4870,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, &locktype, 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; } @@ -4999,7 +5035,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, &locktype, lock, &search, - &header_prev)) { + &header_prev)) + { /* Do nothing. */ } else if (EXISTS(header) && !ANCIENT(header)) { /* @@ -5008,7 +5045,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)) { @@ -5029,7 +5067,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. @@ -5043,7 +5082,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. */ @@ -5066,7 +5106,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. @@ -5112,7 +5153,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, locktype); *nodep = node; @@ -5236,7 +5278,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, node_exit: if ((update != NULL || updatesig != NULL) && - locktype != isc_rwlocktype_write) { + locktype != isc_rwlocktype_write) + { NODE_UNLOCK(lock, locktype); NODE_LOCK(lock, isc_rwlocktype_write); locktype = isc_rwlocktype_write; @@ -5349,7 +5392,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, &locktype, 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'. @@ -5480,7 +5524,8 @@ detachnode(dns_db_t *db, dns_dbnode_t **targetp) { isc_rwlocktype_none, false)) { if (isc_refcount_current(&nodelock->references) == 0 && - nodelock->exiting) { + nodelock->exiting) + { inactive = true; } } @@ -5570,7 +5615,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 + rbtdb->serve_stale_ttl <= - 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 @@ -5634,7 +5680,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); @@ -5865,7 +5912,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; @@ -6004,7 +6052,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? @@ -6165,7 +6214,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); } @@ -6176,7 +6226,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; } @@ -6192,7 +6243,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 && @@ -6203,7 +6255,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. */ @@ -6237,9 +6290,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; @@ -6379,12 +6434,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; } @@ -6429,12 +6486,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; } @@ -6602,7 +6661,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); } @@ -6750,7 +6810,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); } RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); @@ -7038,7 +7099,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; } @@ -7438,7 +7500,8 @@ loading_addrdataset(void *arg, const dns_name_t *name, isc_rwlocktype_write); 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; @@ -9494,7 +9557,8 @@ rehash_bits(rbtdb_version_t *version, size_t newcount) { uint32_t newbits = oldbits; while (newcount >= HASHSIZE(newbits) && - newbits <= RBTDB_GLUE_TABLE_MAX_BITS) { + newbits <= RBTDB_GLUE_TABLE_MAX_BITS) + { newbits += 1; } @@ -9525,7 +9589,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 = hash_32(hash, newbits); diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c index 2af0a8faa7..78897e9567 100644 --- a/lib/dns/rcode.c +++ b/lib/dns/rcode.c @@ -219,7 +219,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 1c476b128c..b7f9ed2b61 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -508,7 +508,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; } @@ -987,7 +988,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 @@ -1035,7 +1037,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; } @@ -1111,7 +1114,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); } } @@ -2195,7 +2199,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); @@ -2204,7 +2209,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); @@ -2230,7 +2236,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); @@ -2258,7 +2265,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 a2f903a064..5fe925407b 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 0cfb537e1c..a6d30e1a6c 100644 --- a/lib/dns/rdata/generic/amtrelay_260.c +++ b/lib/dns/rdata/generic/amtrelay_260.c @@ -452,7 +452,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 3d00653336..70bf9f2c90 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 7161ee62f6..8218d06697 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 9e2bc4db45..32c2db3886 100644 --- a/lib/dns/rdata/generic/key_25.c +++ b/lib/dns/rdata/generic/key_25.c @@ -176,7 +176,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)); } diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c index 4b1e9f182e..c05e14426d 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/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c index 5f54cb90c9..3605a343ed 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 7d0af81665..75f359ec8e 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 6d708b0c12..cf5549d485 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 00a73d394a..e23bd472d3 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 f64bcb30e5..0d9da89683 100644 --- a/lib/dns/rdata/in_1/svcb_64.c +++ b/lib/dns/rdata/in_1/svcb_64.c @@ -82,7 +82,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); @@ -104,13 +105,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; @@ -129,7 +132,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? */ @@ -164,12 +168,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; @@ -218,7 +224,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); @@ -454,7 +461,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); } @@ -621,7 +629,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 35fe675f2a..a2643c749f 100644 --- a/lib/dns/rdatalist.c +++ b/lib/dns/rdatalist.c @@ -203,7 +203,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; } } @@ -215,7 +216,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; } } @@ -275,7 +277,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; } } @@ -305,7 +308,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; } } @@ -317,7 +321,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; } } @@ -377,7 +382,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 5271d3c36c..a2cd83de4f 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 a7e817dbe5..24fdaa83a1 100644 --- a/lib/dns/rdataslab.c +++ b/lib/dns/rdataslab.c @@ -953,7 +953,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 699744eee4..075ac10d81 100644 --- a/lib/dns/request.c +++ b/lib/dns/request.c @@ -665,7 +665,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 7901142d3e..a94bfee98d 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -1089,7 +1089,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); } /* @@ -1124,7 +1125,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); } @@ -1142,7 +1144,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; } @@ -1173,7 +1176,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)) { @@ -1378,7 +1382,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); } @@ -1411,7 +1416,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; } @@ -1522,7 +1528,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); @@ -1531,14 +1538,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); @@ -1738,7 +1747,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) { @@ -1768,7 +1778,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); } @@ -1783,11 +1794,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; @@ -2548,7 +2561,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; } } @@ -2683,7 +2697,8 @@ resquery_send(resquery_t *query) { result = dns_peer_getednsversion(peer, &ednsversion); if (result == ISC_R_SUCCESS && - ednsversion < version) { + ednsversion < version) + { version = ednsversion; } } @@ -3097,7 +3112,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); } @@ -3630,7 +3646,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); @@ -3777,7 +3794,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, @@ -3906,7 +3924,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; } @@ -4164,7 +4183,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); } @@ -4442,7 +4462,8 @@ fctx_destroy(fetchctx_t *fctx, bool exiting) { UNLOCK(&res->buckets[bucketnum].lock); if (bucket_empty && exiting && - isc_refcount_decrement(&res->activebuckets) == 1) { + isc_refcount_decrement(&res->activebuckets) == 1) + { LOCK(&res->lock); send_shutdown_events(res); UNLOCK(&res->lock); @@ -4854,7 +4875,8 @@ fctx_create(dns_resolver_t *res, isc_task_t *task, const dns_name_t *name, * 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); @@ -5432,7 +5454,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); } @@ -5588,7 +5611,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); @@ -5613,7 +5637,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); @@ -5674,7 +5699,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; @@ -5836,7 +5862,8 @@ answer_response: break; } if (sigrdataset == NULL || - sigrdataset->trust != dns_trust_secure) { + sigrdataset->trust != dns_trust_secure) + { continue; } @@ -5864,7 +5891,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; } @@ -5872,7 +5900,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; } @@ -5940,7 +5969,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); } @@ -6011,7 +6041,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; } } @@ -6057,7 +6088,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; @@ -6104,7 +6136,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; } } @@ -6170,7 +6203,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, } if (((name->attributes & DNS_NAMEATTR_ANSWER) != 0) && - (!need_validation)) { + (!need_validation)) + { have_answer = true; event = ISC_LIST_HEAD(fctx->events); @@ -6287,7 +6321,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; /* @@ -6299,7 +6334,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 @@ -6345,24 +6381,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; @@ -6373,7 +6413,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 @@ -6503,7 +6544,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, @@ -6524,7 +6566,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 @@ -6568,7 +6611,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); } @@ -6606,7 +6650,8 @@ cache_message(fetchctx_t *fctx, dns_message_t *message, LOCK(&fctx->res->buckets[fctx->bucketnum].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; @@ -7019,7 +7064,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); } @@ -7475,7 +7521,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; @@ -7814,7 +7861,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); @@ -8086,7 +8134,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; } @@ -8668,7 +8717,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; @@ -8698,7 +8748,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; } @@ -9273,7 +9324,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 " @@ -9297,7 +9349,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 " @@ -9460,7 +9513,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 " @@ -10042,7 +10096,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); @@ -10620,7 +10675,8 @@ dns_resolver_shutdown(dns_resolver_t *res) { atomic_store(&res->buckets[i].exiting, true); if (ISC_LIST_EMPTY(res->buckets[i].fctxs)) { if (isc_refcount_decrement( - &res->activebuckets) == 1) { + &res->activebuckets) == 1) + { is_done = true; } } @@ -10963,7 +11019,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); @@ -11014,7 +11071,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 856b718c7c..7b64cf6f5b 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 3e4cb54739..b2a1023fbf 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -907,9 +907,11 @@ name2ipkey(int log_level, const dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, */ *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; @@ -920,7 +922,8 @@ name2ipkey(int log_level, const dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, } else { l = strtoul(cp, &cp2, 16); if (l > 0xffffu || - (*cp2 != '.' && *cp2 != '\0')) { + (*cp2 != '.' && *cp2 != '\0')) + { if (*cp2 == '.') { *cp2 = '\0'; } @@ -965,7 +968,8 @@ name2ipkey(int log_level, const dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, * 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. @@ -974,7 +978,8 @@ name2ipkey(int log_level, const dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, 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)) + { dns_name_format(ip_name2, ip2_str, sizeof(ip2_str)); isc_log_write(dns_lctx, DNS_LOGCATEGORY_RPZ, DNS_LOGMODULE_RBTDB, log_level, @@ -1703,7 +1708,8 @@ setup_update(dns_rpz_zone_t *rpz) { nodecount = dns_db_nodecount(rpz->updb, dns_dbtree_main); hashsize = 1; while (nodecount != 0 && - hashsize <= (DNS_RPZ_HTSIZE_MAX + DNS_RPZ_HTSIZE_DIV)) { + hashsize <= (DNS_RPZ_HTSIZE_MAX + DNS_RPZ_HTSIZE_DIV)) + { hashsize++; nodecount >>= 1; } @@ -2256,7 +2262,8 @@ dns_rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) { * the last reference. */ for (dns_rpz_num_t rpz_num = 0; rpz_num < DNS_RPZ_MAX_ZONES; - ++rpz_num) { + ++rpz_num) + { dns_rpz_zone_t *rpz = rpzs->zones[rpz_num]; rpzs->zones[rpz_num] = NULL; if (rpz != NULL) { @@ -2422,7 +2429,8 @@ del_cidr(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, 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 9ecc6c5dc5..3be91b6253 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); @@ -374,7 +375,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); } @@ -427,7 +429,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. @@ -927,7 +930,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. */ @@ -1013,7 +1017,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; } } @@ -1085,7 +1090,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 2409092029..b0f978e3fa 100644 --- a/lib/dns/sdb.c +++ b/lib/dns/sdb.c @@ -451,7 +451,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; } } @@ -940,7 +941,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); } @@ -1095,7 +1097,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 a90eb7c6ff..bf436f5683 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -589,7 +589,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); @@ -763,7 +764,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); } @@ -931,11 +933,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; @@ -1935,7 +1939,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 5f3df90062..581cdcd82f 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 4f58ef0d77..390a3978ea 100644 --- a/lib/dns/stats.c +++ b/lib/dns/stats.c @@ -294,7 +294,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) @@ -305,12 +306,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) @@ -494,10 +497,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 de2a0a8d30..894fea477d 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -773,7 +773,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/tsig.c b/lib/dns/tsig.c index 7f119ad087..b70099a629 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; } @@ -1216,7 +1218,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); @@ -1385,7 +1388,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"); @@ -1520,7 +1524,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; @@ -1692,7 +1697,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 " @@ -1701,7 +1707,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 9241b1cad6..9630269ecb 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -1223,7 +1223,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. */ @@ -1338,7 +1339,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. @@ -1417,7 +1419,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, @@ -1695,7 +1698,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, @@ -1817,7 +1821,8 @@ next_state: dns_rdatatype_dname, 0, &dname_exists)); if ((ns_exists || dname_exists) == - (ns_existed || dname_existed)) { + (ns_existed || dname_existed)) + { continue; } /* @@ -2027,7 +2032,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 ddb08c481a..5423c57728 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 a9e9cf0b71..3ee5840095 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -1113,7 +1113,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) { @@ -1141,7 +1142,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); } @@ -1168,7 +1170,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); } @@ -1190,7 +1193,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) { @@ -1287,7 +1291,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 && @@ -1299,7 +1304,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; @@ -1406,7 +1412,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); } @@ -1460,7 +1467,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); } } @@ -1470,7 +1478,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) { @@ -2471,7 +2480,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 1b2b79a1af..08d8f28ea0 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, @@ -1518,17 +1522,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; } @@ -1619,7 +1626,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 caaae33ee4..e2800db233 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -2068,7 +2068,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); } @@ -2208,7 +2209,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 " @@ -2223,7 +2225,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; } } @@ -3567,7 +3570,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; @@ -3653,7 +3657,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; } @@ -3937,7 +3942,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); @@ -4947,7 +4953,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, @@ -5109,7 +5116,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; @@ -5166,7 +5174,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, @@ -5251,7 +5260,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; } } @@ -5301,7 +5311,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 { @@ -5454,7 +5465,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, @@ -6727,12 +6739,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; } @@ -7029,16 +7043,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; @@ -7047,7 +7064,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, @@ -7286,14 +7304,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. */ @@ -7394,7 +7414,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; } @@ -7680,7 +7701,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); } @@ -7881,7 +7903,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 || @@ -7900,7 +7923,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; @@ -7913,7 +7937,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; } @@ -8220,7 +8245,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)); @@ -9478,7 +9504,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; } @@ -9904,7 +9931,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; } @@ -9922,7 +9950,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; } /* @@ -9940,7 +9969,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; @@ -10506,7 +10536,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)); @@ -10675,7 +10706,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; } @@ -10788,7 +10820,8 @@ anchors_done: if (!secure) { if (keydata.removehd != 0 && - keydata.removehd <= now) { + keydata.removehd <= now) + { deletekey = true; } } else if (keydata.addhd == 0) { @@ -11985,7 +12018,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); @@ -12033,7 +12067,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; } @@ -12106,7 +12141,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; } } @@ -12913,7 +12949,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)) { @@ -12999,7 +13036,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; } @@ -13071,13 +13109,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); @@ -14291,7 +14331,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 " @@ -14771,7 +14812,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; @@ -14788,7 +14830,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; @@ -15333,7 +15376,8 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) { { 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; } } @@ -15351,19 +15395,22 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) { } 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; } } @@ -15401,7 +15448,8 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) { !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; } } @@ -15410,7 +15458,8 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) { { 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; } } @@ -15422,7 +15471,8 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) { { 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; } } @@ -16182,7 +16232,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"); @@ -17122,7 +17173,8 @@ getprivate: * Do we have a valid private record? */ if (!dns_nsec3param_fromprivate(&private, &rdata, buf, - sizeof(buf))) { + sizeof(buf))) + { continue; } @@ -17136,7 +17188,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 && @@ -17963,7 +18016,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); @@ -18734,7 +18788,8 @@ zonemgr_keymgmt_destroy(dns_zonemgr_t *zmgr) { RWLOCK(&mgmt->lock, isc_rwlocktype_write); size = 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); @@ -19228,7 +19283,8 @@ dns_zonemgr_forcemaint(dns_zonemgr_t *zmgr) { RWLOCK(&zmgr->rwlock, isc_rwlocktype_read); for (p = ISC_LIST_HEAD(zmgr->zones); p != NULL; - p = ISC_LIST_NEXT(p, link)) { + p = ISC_LIST_NEXT(p, link)) + { dns_zone_maintenance(p); } RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_read); @@ -19462,7 +19518,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); @@ -20531,7 +20588,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; } } @@ -20682,7 +20740,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; } } @@ -21134,7 +21193,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) { @@ -21531,13 +21591,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); @@ -21630,7 +21692,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; } @@ -21909,7 +21972,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) && @@ -21946,7 +22010,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; } @@ -22018,7 +22083,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); @@ -22053,7 +22119,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; } @@ -22076,7 +22143,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; } @@ -22111,12 +22179,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; } @@ -22192,7 +22262,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) { @@ -22201,7 +22272,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; } } @@ -22215,7 +22287,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, @@ -22352,7 +22425,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; } @@ -22413,7 +22487,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; } } @@ -22485,7 +22560,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; } @@ -22808,12 +22884,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; } @@ -23119,7 +23197,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; } @@ -23327,7 +23406,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 00821be6ce..f86c2ca9f2 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 96f2845172..593ed5b464 100644 --- a/lib/dns/zoneverify.c +++ b/lib/dns/zoneverify.c @@ -880,12 +880,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 " @@ -1245,13 +1247,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); @@ -1525,7 +1529,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; } @@ -1666,7 +1671,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)); @@ -1777,7 +1783,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 cbc0a8df5f..a0c300aaf0 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/app.c b/lib/isc/app.c index 413a02640d..da438d72a5 100644 --- a/lib/isc/app.c +++ b/lib/isc/app.c @@ -189,7 +189,8 @@ isc_app_ctxrun(isc_appctx_t *ctx) { */ LOCK(&ctx->lock); for (event = ISC_LIST_HEAD(ctx->on_run); event != NULL; - event = next_event) { + event = next_event) + { next_event = ISC_LIST_NEXT(event, ev_link); ISC_LIST_UNLINK(ctx->on_run, event, ev_link); task = event->ev_sender; diff --git a/lib/isc/file.c b/lib/isc/file.c index aca5e3ca89..e3a61de438 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/heap.c b/lib/isc/heap.c index 0f7de62c86..7b0cc28854 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 d67f91b394..95ee13bc48 100644 --- a/lib/isc/ht.c +++ b/lib/isc/ht.c @@ -123,7 +123,8 @@ isc_ht_add(isc_ht_t *ht, const unsigned char *key, uint32_t keysize, node = ht->table[hash & ht->mask]; while (node != NULL) { if (keysize == node->keysize && - memcmp(key, node->key, keysize) == 0) { + memcmp(key, node->key, keysize) == 0) + { return (ISC_R_EXISTS); } node = node->next; @@ -155,7 +156,8 @@ isc_ht_find(const isc_ht_t *ht, const unsigned char *key, uint32_t keysize, node = ht->table[hash & ht->mask]; while (node != NULL) { if (keysize == node->keysize && - memcmp(key, node->key, keysize) == 0) { + memcmp(key, node->key, keysize) == 0) + { if (valuep != NULL) { *valuep = node->value; } @@ -180,7 +182,8 @@ isc_ht_delete(isc_ht_t *ht, const unsigned char *key, uint32_t keysize) { node = ht->table[hash & ht->mask]; while (node != NULL) { if (keysize == node->keysize && - memcmp(key, node->key, keysize) == 0) { + memcmp(key, node->key, keysize) == 0) + { if (prev == NULL) { ht->table[hash & ht->mask] = node->next; } else { diff --git a/lib/isc/lex.c b/lib/isc/lex.c index 63b9b79d34..19ed4a74f0 100644 --- a/lib/isc/lex.c +++ b/lib/isc/lex.c @@ -382,7 +382,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); } @@ -492,7 +493,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; @@ -507,13 +509,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; @@ -526,7 +530,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; @@ -543,14 +548,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; @@ -569,7 +576,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; @@ -584,10 +592,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; @@ -616,7 +626,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; @@ -656,7 +667,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) { @@ -673,7 +685,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); @@ -692,7 +705,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; @@ -826,7 +840,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; @@ -952,13 +967,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) { @@ -992,7 +1009,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 95c3e6b05d..4ad9983769 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -918,7 +918,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; } @@ -1070,7 +1071,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", @@ -1206,7 +1208,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", @@ -1243,7 +1246,8 @@ roll_increment(isc_logfile_t *file) { n = snprintf(current, sizeof(current), "%s.%u", path, (unsigned)greatest); if (n >= (int)sizeof(current) || n < 0 || - !isc_file_exists(current)) { + !isc_file_exists(current)) + { break; } } @@ -1560,7 +1564,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; @@ -1574,7 +1579,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; } @@ -1588,7 +1594,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); @@ -1602,7 +1609,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); @@ -1656,7 +1664,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 @@ -1693,7 +1702,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 e99471b0b2..61b7222491 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -1403,7 +1403,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)); @@ -1559,7 +1560,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); @@ -1701,7 +1703,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 940fbf0370..c674d839b2 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 614bada711..f2d3e2d558 100644 --- a/lib/isc/netmgr/http.c +++ b/lib/isc/netmgr/http.c @@ -562,7 +562,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; } @@ -1722,7 +1723,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) { @@ -2211,7 +2213,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; } @@ -2730,7 +2733,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; } @@ -3197,9 +3201,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); } @@ -3309,7 +3315,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; @@ -3527,7 +3534,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 f2be97f6a3..fca577e6c9 100644 --- a/lib/isc/netmgr/netmgr.c +++ b/lib/isc/netmgr/netmgr.c @@ -2364,7 +2364,8 @@ isc__nm_process_sock_buffer(isc_nmsocket_t *sock) { isc__nmsocket_timer_stop(sock); if (atomic_load(&sock->client) || - atomic_load(&sock->sequential)) { + atomic_load(&sock->sequential)) + { isc__nm_stop_reading(sock); goto done; } @@ -2559,7 +2560,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->mgr->mctx, req, sizeof(*req)); } #else /* !__SANITIZE_ADDRESS__ && !__SANITIZE_THREAD__ */ @@ -2739,7 +2741,8 @@ isc__nmsocket_stop(isc_nmsocket_t *listener) { REQUIRE(VALID_NMSOCK(listener)); if (!atomic_compare_exchange_strong(&listener->closing, - &(bool){ false }, true)) { + &(bool){ false }, true)) + { UNREACHABLE(); } @@ -3445,7 +3448,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); @@ -3468,7 +3472,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/tcp.c b/lib/isc/netmgr/tcp.c index 86c73af57e..2a644fed3f 100644 --- a/lib/isc/netmgr/tcp.c +++ b/lib/isc/netmgr/tcp.c @@ -665,7 +665,8 @@ isc__nm_tcp_stoplistening(isc_nmsocket_t *sock) { REQUIRE(sock->type == isc_nm_tcplistener); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -798,7 +799,8 @@ isc__nm_tcp_pauseread(isc_nmhandle_t *handle) { REQUIRE(VALID_NMSOCK(sock)); if (!atomic_compare_exchange_strong(&sock->readpaused, &(bool){ false }, - true)) { + true)) + { return; } @@ -846,7 +848,8 @@ isc__nm_tcp_resumeread(isc_nmhandle_t *handle) { } if (!atomic_compare_exchange_strong(&sock->readpaused, &(bool){ true }, - false)) { + false)) + { return; } @@ -1181,7 +1184,8 @@ tcp_stop_cb(uv_handle_t *handle) { REQUIRE(atomic_load(&sock->closing)); if (!atomic_compare_exchange_strong(&sock->closed, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -1199,7 +1203,8 @@ tcp_close_sock(isc_nmsocket_t *sock) { REQUIRE(atomic_load(&sock->closing)); if (!atomic_compare_exchange_strong(&sock->closed, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -1242,7 +1247,8 @@ stop_tcp_child(isc_nmsocket_t *sock) { REQUIRE(sock->tid == isc_nm_tid()); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { return; } @@ -1320,7 +1326,8 @@ isc__nm_tcp_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/tcpdns.c b/lib/isc/netmgr/tcpdns.c index ff9f1380c1..eda6aa62ce 100644 --- a/lib/isc/netmgr/tcpdns.c +++ b/lib/isc/netmgr/tcpdns.c @@ -631,7 +631,8 @@ isc__nm_tcpdns_stoplistening(isc_nmsocket_t *sock) { REQUIRE(sock->type == isc_nm_tcpdnslistener); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -1240,7 +1241,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(); } @@ -1258,7 +1260,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(); } @@ -1304,7 +1307,8 @@ stop_tcpdns_child(isc_nmsocket_t *sock) { REQUIRE(sock->tid == isc_nm_tid()); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { return; } @@ -1376,7 +1380,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 c624b3c36b..19da3353e3 100644 --- a/lib/isc/netmgr/tlsdns.c +++ b/lib/isc/netmgr/tlsdns.c @@ -744,7 +744,8 @@ isc__nm_tlsdns_stoplistening(isc_nmsocket_t *sock) { REQUIRE(sock->type == isc_nm_tlsdnslistener); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -1141,7 +1142,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) { @@ -1302,7 +1304,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; } @@ -1882,7 +1885,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(); } @@ -1907,7 +1911,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(); } @@ -1969,7 +1974,8 @@ stop_tlsdns_child(isc_nmsocket_t *sock) { REQUIRE(sock->tid == isc_nm_tid()); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { return; } @@ -2044,7 +2050,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; } @@ -2245,7 +2252,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 b09dd91838..3477fa313c 100644 --- a/lib/isc/netmgr/tlsstream.c +++ b/lib/isc/netmgr/tlsstream.c @@ -453,7 +453,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 @@ -943,7 +944,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; } @@ -1129,7 +1131,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); @@ -1155,7 +1158,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 10065d2a1a..1a0ee16831 100644 --- a/lib/isc/netmgr/udp.c +++ b/lib/isc/netmgr/udp.c @@ -521,7 +521,8 @@ isc__nm_udp_stoplistening(isc_nmsocket_t *sock) { REQUIRE(sock->type == isc_nm_udplistener); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -1179,7 +1180,8 @@ udp_stop_cb(uv_handle_t *handle) { REQUIRE(atomic_load(&sock->closing)); if (!atomic_compare_exchange_strong(&sock->closed, &(bool){ false }, - true)) { + true)) + { UNREACHABLE(); } @@ -1200,7 +1202,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(); } @@ -1234,7 +1237,8 @@ stop_udp_child(isc_nmsocket_t *sock) { REQUIRE(sock->tid == isc_nm_tid()); if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false }, - true)) { + true)) + { return; } @@ -1306,7 +1310,8 @@ isc__nm_udp_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/picohttpparser.c b/lib/isc/picohttpparser.c index 95c0d6f511..d82fd01986 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 a5dd28fddf..d84e5d0302 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 9a56dc30a1..156b469ece 100644 --- a/lib/isc/rwlock.c +++ b/lib/isc/rwlock.c @@ -334,7 +334,8 @@ isc__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; } @@ -342,7 +343,8 @@ isc__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--; @@ -386,10 +388,12 @@ isc__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/task.c b/lib/isc/task.c index df0e91207e..81909c8c36 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -299,7 +299,8 @@ task_shutdown(isc_task_t *task) { XTRACE("task_shutdown"); if (atomic_compare_exchange_strong(&task->shuttingdown, - &(bool){ false }, true)) { + &(bool){ false }, true)) + { XTRACE("shutting down"); if (task->state == task_state_idle) { INSIST(EMPTY(task->events)); @@ -313,7 +314,8 @@ task_shutdown(isc_task_t *task) { * Note that we post shutdown events LIFO. */ for (event = TAIL(task->on_shutdown); event != NULL; - event = prev) { + event = prev) + { prev = PREV(event, ev_link); DEQUEUE(task->on_shutdown, event, ev_link); ENQUEUE(task->events, event, ev_link); @@ -855,7 +857,8 @@ task_run(isc_task_t *task) { */ XTRACE("empty"); if (isc_refcount_current(&task->references) == 0 && - TASK_SHUTTINGDOWN(task)) { + TASK_SHUTTINGDOWN(task)) + { /* * The task is done. */ @@ -1036,7 +1039,8 @@ isc__taskmgr_destroy(isc_taskmgr_t **managerp) { #ifdef ISC_TASK_TRACE int counter = 0; while (isc_refcount_current(&(*managerp)->references) > 1 && - counter++ < 1000) { + counter++ < 1000) + { usleep(10 * 1000); } INSIST(counter < 1000); diff --git a/lib/isc/timer.c b/lib/isc/timer.c index a9d15cb390..1b278eff30 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -532,7 +532,8 @@ dispatch(isc_timermgr_t *manager, isc_time_t *now) { LOCK(&timer->lock); if (!isc_time_isepoch(&timer->idle) && - isc_time_compare(now, &timer->idle) >= 0) { + isc_time_compare(now, &timer->idle) >= 0) + { idle = true; } UNLOCK(&timer->lock); diff --git a/lib/isc/tls.c b/lib/isc/tls.c index f92a6ac049..b517de761f 100644 --- a/lib/isc/tls.c +++ b/lib/isc/tls.c @@ -1236,13 +1236,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. @@ -1307,7 +1309,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; } @@ -1318,12 +1321,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 7f61874341..cccb712be3 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 6c86713466..a348c5dab2 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 e7015ec43e..182ada0b00 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 83075f54f2..52914ed5ae 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 9bd51187c1..62e4614583 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); } @@ -169,14 +170,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; \ @@ -279,7 +282,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 716ffe6cee..1e3566a99c 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 a0460ff968..ba36b0d8ee 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 64f2e2cc97..7925d53f8e 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", @@ -1529,7 +1530,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") == @@ -3198,7 +3200,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, @@ -3807,14 +3810,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; @@ -3907,7 +3912,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 e35b4e7f3b..db9b99ea32 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/hooks.c b/lib/ns/hooks.c index 27c14ed098..3f614b667e 100644 --- a/lib/ns/hooks.c +++ b/lib/ns/hooks.c @@ -295,7 +295,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 10deb55fb9..06f23628d0 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -124,7 +124,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 }; @@ -180,7 +181,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. @@ -713,7 +715,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; } @@ -1176,11 +1179,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; } @@ -1203,7 +1208,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; @@ -1237,7 +1243,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; } @@ -1270,7 +1277,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 85fc12eb63..df9719f5e1 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 35c3974d88..2da89d096a 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -976,7 +976,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); } @@ -1020,7 +1021,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); } @@ -1316,7 +1318,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)); @@ -1396,7 +1399,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; @@ -1477,7 +1481,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) { @@ -1559,7 +1564,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); } @@ -1849,7 +1855,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; } @@ -1892,7 +1899,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; } @@ -1936,7 +1944,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) { @@ -1954,7 +1963,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, @@ -1972,7 +1982,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 = @@ -1988,7 +1999,8 @@ found: } else { dns_rdataset_disassociate(rdataset); if (sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } } @@ -2006,7 +2018,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) { @@ -2026,12 +2039,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, @@ -2044,7 +2059,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; @@ -3086,7 +3102,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)) @@ -3104,7 +3121,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); @@ -3129,7 +3147,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, @@ -3359,7 +3378,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) { @@ -3687,7 +3707,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, @@ -3984,7 +4005,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); } @@ -4150,7 +4172,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 @@ -4282,7 +4305,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, @@ -4436,7 +4460,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); @@ -4723,7 +4748,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); @@ -5244,7 +5270,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) { @@ -5401,7 +5428,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; } @@ -5889,7 +5917,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; } @@ -5904,7 +5933,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); } } @@ -5955,7 +5985,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; @@ -6556,7 +6587,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 { @@ -6650,7 +6682,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; @@ -6669,7 +6702,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? */ @@ -6706,7 +6740,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) + { tname = qctx->rpz_st->fname; } else if (REDIRECT(qctx->client)) { tname = qctx->client->query.redirect.fname; @@ -6717,7 +6752,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), @@ -7172,7 +7208,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; @@ -7277,7 +7314,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; } @@ -7310,7 +7348,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, @@ -8003,7 +8042,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)); @@ -8224,7 +8264,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; } @@ -9320,7 +9361,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 & DNS_NAMEATTR_WILDCARD) == 0) { dns_name_t *found; dns_name_t *qname; @@ -9367,7 +9409,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 " @@ -9424,7 +9467,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); } @@ -9450,7 +9494,8 @@ query_addnxrrsetnsec(query_ctx_t *qctx) { } if (qctx->sigrdataset == NULL || - !dns_rdataset_isassociated(qctx->sigrdataset)) { + !dns_rdataset_isassociated(qctx->sigrdataset)) + { return; } @@ -10222,7 +10267,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; } @@ -10717,7 +10763,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. */ @@ -11188,7 +11235,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. @@ -11620,7 +11668,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); @@ -11682,7 +11731,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, @@ -11763,7 +11813,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; } @@ -11795,7 +11846,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. @@ -12241,7 +12293,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); } @@ -12264,7 +12317,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 a0599cad65..260b0b16d8 100644 --- a/lib/ns/update.c +++ b/lib/ns/update.c @@ -824,7 +824,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); @@ -928,7 +929,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); } @@ -1167,7 +1169,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); @@ -1219,7 +1222,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); @@ -1818,7 +1822,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, @@ -1863,9 +1868,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; } @@ -2057,7 +2064,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)); @@ -2161,7 +2169,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) { /* @@ -2220,7 +2229,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) { /* @@ -2248,7 +2258,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. @@ -2353,7 +2364,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); @@ -2413,7 +2425,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; } @@ -2486,7 +2499,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 @@ -2877,7 +2891,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 " @@ -2939,7 +2954,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 && @@ -3007,7 +3023,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, @@ -3081,7 +3098,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, @@ -3108,7 +3126,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 " @@ -3231,7 +3250,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)); @@ -3262,7 +3282,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, @@ -3545,12 +3566,14 @@ update_action(isc_task_t *task, isc_event_t *event) { dns_rdata_nsec3param_t nsec3param; if (tuple->rdata.type != 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; } dns_rdata_tostruct(&rdata, &nsec3param, NULL); diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c index bb3e2c4cd6..827a7b68e0 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; @@ -1498,7 +1499,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/isc/netmgr_test.c b/tests/isc/netmgr_test.c index 94e4bf792a..ceed931851 100644 --- a/tests/isc/netmgr_test.c +++ b/tests/isc/netmgr_test.c @@ -326,7 +326,8 @@ setup_test(void **state __attribute__((unused))) { 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 8c41e97138..1935846a4a 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/task_test.c b/tests/isc/task_test.c index e2e5020caa..69492db851 100644 --- a/tests/isc/task_test.c +++ b/tests/isc/task_test.c @@ -959,7 +959,8 @@ pg_event2(isc_task_t *task, isc_event_t *event) { if (testrange) { if ((purge_type_first <= event->ev_type) && - (event->ev_type <= purge_type_last)) { + (event->ev_type <= purge_type_last)) + { type_match = true; } } else { @@ -1065,7 +1066,8 @@ test_purge(int sender, int type, int tag, int exp_purged) { */ if (((sender_cnt % 2) != 0) && ((type_cnt % 2) != 0) && - ((tag_cnt % 2) != 0)) { + ((tag_cnt % 2) != 0)) + { eventtab[event_cnt]->ev_attributes |= ISC_EVENTATTR_NOPURGE; } diff --git a/tests/libtest/dns.c b/tests/libtest/dns.c index ee94c61f1a..ae3748fb41 100644 --- a/tests/libtest/dns.c +++ b/tests/libtest/dns.c @@ -290,7 +290,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 5a4a9d0681..35d18aaa56 100644 --- a/tests/libtest/ns.c +++ b/tests/libtest/ns.c @@ -635,7 +635,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 6b26185913..802cb28e8b 100644 --- a/tests/ns/query_test.c +++ b/tests/ns/query_test.c @@ -929,7 +929,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);