From 8e87a1592d8d757b09a4f76ad7c65f222da399b6 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Tue, 13 Dec 2016 23:51:10 +0000 Subject: [PATCH] update copyright notice / whitespace --- bin/tests/system/nsupdate/ns1/named.conf | 2 +- bin/tests/system/nsupdate/ns1/sample.db.in | 14 +++++++ bin/tests/system/nsupdate/ns2/named.conf | 46 +++++++++++----------- bin/tests/system/nsupdate/ns2/sample.db.in | 14 +++++++ bin/tests/system/resolver/clean.sh | 2 +- lib/export/samples/sample-update.c | 2 +- 6 files changed, 54 insertions(+), 26 deletions(-) diff --git a/bin/tests/system/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf index 77e7158b42..5029ebf5c5 100644 --- a/bin/tests/system/nsupdate/ns1/named.conf +++ b/bin/tests/system/nsupdate/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013, 2016 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/nsupdate/ns1/sample.db.in b/bin/tests/system/nsupdate/ns1/sample.db.in index 6881eb0162..531d97e181 100644 --- a/bin/tests/system/nsupdate/ns1/sample.db.in +++ b/bin/tests/system/nsupdate/ns1/sample.db.in @@ -1,3 +1,17 @@ +; Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and/or distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + @ 0 SOA ns1 . 0 0 0 0 0 @ 0 NS ns1 ns1 0 A 10.53.0.1 diff --git a/bin/tests/system/nsupdate/ns2/named.conf b/bin/tests/system/nsupdate/ns2/named.conf index 913a0b9ba3..8569d6f61c 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf +++ b/bin/tests/system/nsupdate/ns2/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007, 2011 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2011, 2016 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -33,37 +33,37 @@ options { }; key altkey { - algorithm hmac-md5; - secret "1234abcd8765"; + algorithm hmac-md5; + secret "1234abcd8765"; }; view alternate { - match-clients { key altkey; }; + match-clients { key altkey; }; - zone "update.nil" { - type slave; - masters { 10.53.0.1; }; - file "update.alt.bk"; - allow-transfer { any; }; - }; + zone "update.nil" { + type slave; + masters { 10.53.0.1; }; + file "update.alt.bk"; + allow-transfer { any; }; + }; }; view primary { - match-clients { any; }; + match-clients { any; }; - zone "example.nil" { - type slave; - masters { 10.53.0.1; }; - file "example.bk"; - allow-transfer { any; }; - }; + zone "example.nil" { + type slave; + masters { 10.53.0.1; }; + file "example.bk"; + allow-transfer { any; }; + }; - zone "update.nil" { - type slave; - masters { 10.53.0.1; }; - file "update.bk"; - allow-transfer { any; }; - }; + zone "update.nil" { + type slave; + masters { 10.53.0.1; }; + file "update.bk"; + allow-transfer { any; }; + }; zone "sample" { type master; diff --git a/bin/tests/system/nsupdate/ns2/sample.db.in b/bin/tests/system/nsupdate/ns2/sample.db.in index fde9dae8d6..8a8c07f25a 100644 --- a/bin/tests/system/nsupdate/ns2/sample.db.in +++ b/bin/tests/system/nsupdate/ns2/sample.db.in @@ -1,3 +1,17 @@ +; Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and/or distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + @ 0 SOA ns2 . 0 0 0 0 0 @ 0 NS ns2 ns2 0 A 10.53.0.2 diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh index 9ec1545dc9..c68b389e3c 100644 --- a/bin/tests/system/resolver/clean.sh +++ b/bin/tests/system/resolver/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2008-2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2008-2016 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/lib/export/samples/sample-update.c b/lib/export/samples/sample-update.c index 726b8229a4..9134fb96b3 100644 --- a/lib/export/samples/sample-update.c +++ b/lib/export/samples/sample-update.c @@ -162,7 +162,7 @@ main(int argc, char *argv[]) { port = optarg; break; case 'r': - if (nsa_recursive < + if (nsa_recursive < sizeof(sa_recursive)/sizeof(*sa_recursive) && addserver(optarg, &rec_servers, &sa_recursive[nsa_recursive]))