From f929677ed8e0550fdc1bc4686bb35a0b0d545c31 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Wed, 8 Feb 2017 23:45:32 +0000 Subject: [PATCH] update copyright notice / whitespace --- bin/named/query.c | 4 ++-- bin/tests/system/dnstap/bad-size-version.conf | 2 +- bin/tests/system/dnstap/good-size-unlimited.conf | 2 +- bin/tests/system/dnstap/good-size-version.conf | 2 +- bin/tests/system/dnstap/ns1/named.conf | 2 +- bin/tests/system/dnstap/ns2/named.conf | 2 +- bin/tests/system/dnstap/tests.sh | 2 +- lib/bind9/check.c | 2 +- lib/isc/include/isc/result.h | 2 +- lib/isc/result.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/named/query.c b/bin/named/query.c index aca54a7db3..2438b07be8 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -6612,7 +6612,7 @@ query_respond_any(query_ctx_t *qctx) { query_addrrset(qctx->client, (qctx->fname != NULL) - ? &qctx->fname + ? &qctx->fname : &tname, &qctx->rdataset, NULL, NULL, DNS_SECTION_ANSWER); @@ -9740,7 +9740,7 @@ log_query(ns_client_t *client, unsigned int flags, unsigned int extflags) { if (client->ednsversion >= 0) snprintf(ednsbuf, sizeof(ednsbuf), "E(%d)", client->ednsversion); - + if (HAVEECS(client)) { strlcpy(ecsbuf, " [ECS ", sizeof(ecsbuf)); dns_ecs_format(&client->ecs, ecsbuf + 6, sizeof(ecsbuf) - 6); diff --git a/bin/tests/system/dnstap/bad-size-version.conf b/bin/tests/system/dnstap/bad-size-version.conf index 3fb6bc506a..8706fdd609 100644 --- a/bin/tests/system/dnstap/bad-size-version.conf +++ b/bin/tests/system/dnstap/bad-size-version.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 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/dnstap/good-size-unlimited.conf b/bin/tests/system/dnstap/good-size-unlimited.conf index 0c3bcacd5e..7b04fbb347 100644 --- a/bin/tests/system/dnstap/good-size-unlimited.conf +++ b/bin/tests/system/dnstap/good-size-unlimited.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 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/dnstap/good-size-version.conf b/bin/tests/system/dnstap/good-size-version.conf index 417f600044..0a4573d950 100644 --- a/bin/tests/system/dnstap/good-size-version.conf +++ b/bin/tests/system/dnstap/good-size-version.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 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/dnstap/ns1/named.conf b/bin/tests/system/dnstap/ns1/named.conf index 8d7b27cfa4..95152977fd 100644 --- a/bin/tests/system/dnstap/ns1/named.conf +++ b/bin/tests/system/dnstap/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2015-2017 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/dnstap/ns2/named.conf b/bin/tests/system/dnstap/ns2/named.conf index 913e249867..8fd5f26129 100644 --- a/bin/tests/system/dnstap/ns2/named.conf +++ b/bin/tests/system/dnstap/ns2/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2015-2017 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/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh index dca1fd61ed..f0795f5fad 100644 --- a/bin/tests/system/dnstap/tests.sh +++ b/bin/tests/system/dnstap/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2015-2017 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/lib/bind9/check.c b/lib/bind9/check.c index 34ce342ade..8b4ef54340 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2001-2017 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/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h index ec5f38936d..42e58ce3ac 100644 --- a/lib/isc/include/isc/result.h +++ b/lib/isc/include/isc/result.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2001, 2003-2009, 2012, 2014-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1998-2001, 2003-2009, 2012, 2014-2017 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/lib/isc/result.c b/lib/isc/result.c index bb8c6eb596..702c5db7cc 100644 --- a/lib/isc/result.c +++ b/lib/isc/result.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2001, 2003-2005, 2007, 2008, 2012, 2014-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1998-2001, 2003-2005, 2007, 2008, 2012, 2014-2017 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 -- GitLab