From 4ef83f4333f19868f82b23259507c778c928c52d Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Wed, 28 Dec 2016 23:48:39 +0000 Subject: [PATCH] update copyright notice / whitespace --- CHANGES | 2 +- bin/named/server.c | 8 ++++---- bin/tools/dnstap-read.c | 8 ++++---- lib/dns/message.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 4b616a30ba..2b3e1ab4fe 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 d95e29a011..45c592b345 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -8980,8 +8980,8 @@ zone_from_args(ns_server_t *server, isc_lex_t *lex, const char *zonetxt, } } else { result = dns_viewlist_findzone(&server->viewlist, - name, ISC_TF(classtxt == NULL), - rdclass, zonep); + name, ISC_TF(classtxt == NULL), + rdclass, zonep); if (result == ISC_R_NOTFOUND) snprintf(problem, sizeof(problem), "no matching zone '%s' in any view", @@ -9006,7 +9006,7 @@ zone_from_args(ns_server_t *server, isc_lex_t *lex, const char *zonetxt, result = ISC_R_SUCCESS; } else result = ISC_R_NOTFOUND; - } else + } else result = dns_zt_find(view->zonetable, name, 0, NULL, zonep); if (result != ISC_R_SUCCESS) @@ -11699,7 +11699,7 @@ do_modzone(ns_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, dns_zone_attach(view->redirect, &zone); } else CHECK(dns_zt_find(view->zonetable, name, 0, NULL, &zone)); - + #ifndef HAVE_LMDB 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)