update copyright notice / whitespace

diff --git a/bin/tests/system/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf
index 9aa3b522d4a78a430ccb1da9261a7cc1453939dd..7d46026716ed5342512b61945e1b919e8a4f5f51 100644 (file)
--- 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-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011-2014, 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 6881eb01622137ff68bee559b6f64feda34ec595..531d97e181483a64826946924721230439e4e62d 100644 (file)
--- 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 bccf445561baa9a23a4816c97ed70ae2d7c248e3..c7b31c076ec7363a7ebef48cb035993c13739607 100644 (file)
--- 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, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 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/ns2/sample.db.in b/bin/tests/system/nsupdate/ns2/sample.db.in
index fde9dae8d6e3381b65445cea21b1223b6a2ad085..8a8c07f25a47c2e8cbe493f3948a4bce70b685f3 100644 (file)
--- 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/lib/samples/sample-update.c b/lib/samples/sample-update.c
index c52add90d677da236009b0544a53ce2c5eeef1b4..1520e4bed13fdb5f2c9dd05dcf30ad2cca5dea21 100644 (file)
--- a/lib/samples/sample-update.c
+++ b/lib/samples/sample-update.c
@@ -166,7 +166,7 @@ main(int argc, char *argv[]) {
                        port = isc_commandline_argument;
                        break;
                case 'r':
-                       if (nsa_recursive < 
+                       if (nsa_recursive <
                                sizeof(sa_recursive)/sizeof(*sa_recursive) &&
                            addserver(isc_commandline_argument, &rec_servers,
                                      &sa_recursive[nsa_recursive]))