From 2a2618356ecdf5962230fe11606d2b106a638295 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Wed, 28 Dec 2016 23:50:44 +0000 Subject: [PATCH] update copyright notice / whitespace --- CHANGES | 2 +- bin/named/server.c | 2 +- bin/tests/system/addzone/ns2/hints.db | 2 +- bin/tests/system/addzone/ns2/redirect.db | 3 ++- bin/tools/dnstap-read.c | 8 ++++---- lib/dns/message.c | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGES b/CHANGES index 0f4b4899d1..85fa872364 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -4545. [func] Expand YAML output from dnstap-read to include +4545. [func] Expand YAML output from dnstap-read to include a detailed breakdown of the DNS message contents. [RT #43642] diff --git a/bin/named/server.c b/bin/named/server.c index f56a692d22..27ffd36659 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -2147,7 +2147,7 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { RUNTIME_CHECK(result == ISC_R_SUCCESS); dns_view_thaw(ev->view); result = configure_zone(cfg->config, zoneobj, cfg->vconfig, - ev->cbd->server->mctx, ev->view, + ev->cbd->server->mctx, ev->view, &ev->cbd->server->viewlist, cfg->actx, ISC_TRUE, ISC_FALSE, ev->mod); dns_view_freeze(ev->view); diff --git a/bin/tests/system/addzone/ns2/hints.db b/bin/tests/system/addzone/ns2/hints.db index 274ec9a845..5f952ab8fa 100644 --- a/bin/tests/system/addzone/ns2/hints.db +++ b/bin/tests/system/addzone/ns2/hints.db @@ -1,4 +1,4 @@ -; Copyright (C) 2000, 2001, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") ; ; This Source Code Form is subject to the terms of the Mozilla Public ; License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/bin/tests/system/addzone/ns2/redirect.db b/bin/tests/system/addzone/ns2/redirect.db index 63a371b4be..4636dc8aef 100644 --- a/bin/tests/system/addzone/ns2/redirect.db +++ b/bin/tests/system/addzone/ns2/redirect.db @@ -1,7 +1,8 @@ ; Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") -; +; ; This Source Code Form is subject to the terms of the Mozilla Public ; License, v. 2.0. If a copy of the MPL was not distributed with this ; file, You can obtain one at http://mozilla.org/MPL/2.0/. + @ 0 SOA . . 0 0 0 0 0 @ 0 NS . diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c index 585a1dfb32..aae823fa5b 100644 --- a/bin/tools/dnstap-read.c +++ b/bin/tools/dnstap-read.c @@ -192,10 +192,10 @@ print_yaml(dns_dtdata_t *dt) { printf(" response_time: !!timestamp %s\n", buf); } - if (dt->msgdata.base != NULL) { - printf(" message_size: %zdb\n", (size_t) dt->msgdata.length); - } else - printf(" message_size: 0b\n"); + if (dt->msgdata.base != NULL) { + printf(" message_size: %zdb\n", (size_t) dt->msgdata.length); + } else + printf(" message_size: 0b\n"); if (m->has_socket_family) { const ProtobufCEnumValue *type = diff --git a/lib/dns/message.c b/lib/dns/message.c index 46e68c1b99..0fc6b58f5b 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -83,7 +83,7 @@ hexdump(const char *msg, const char *msg2, void *base, size_t len) { isc_buffer_availablelength(b)) { \ result = ISC_R_NOSPACE; \ goto cleanup; \ - } else \ + } else \ isc_buffer_putstr(b, s);} #define VALID_PSEUDOSECTION(s) (((s) >= DNS_PSEUDOSECTION_ANY) \ && ((s) < DNS_PSEUDOSECTION_MAX)) @@ -1632,7 +1632,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, ((msg->flags & DNS_MESSAGEFLAG_QR) != 0) && ((msg->flags & DNS_MESSAGEFLAG_TC) == 0) && !preserve_order && - !auth_signed(section)) + !auth_signed(section)) DO_ERROR(DNS_R_FORMERR); if (seen_problem)