update copyright notice / whitespace

diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index 43e4ed5a4473949e1406a045fc3867f2267044e3..c10b204b951b775b2580d9e27fd51767a97dfa35 100644 (file)
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007-2015  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/ntadiff.pl b/bin/tests/system/dnssec/ntadiff.pl
index d3f5554230dc4b126db5d447595173dd2fb7240b..a8a87f436c3aaf9990baa5f58ea259f7055a0fa2 100755 (executable)
--- a/bin/tests/system/dnssec/ntadiff.pl
+++ b/bin/tests/system/dnssec/ntadiff.pl
@@ -1,4 +1,18 @@
 #!/usr/bin/perl -w
+#
+# Copyright (C) 2015  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.
 
 use strict;
 use Time::Piece;

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 974c876559af0575cd23ff87b8e102b38adef158..60a9bacd30390a4d1e1fd370462a79ec15061d45 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/nta.h b/lib/dns/include/dns/nta.h
index 96b268ed56fe783488c012986766048196942f16..31a0b956d1efd2ba93c830c06a27ebab1e6e91cd 100644 (file)
--- a/lib/dns/include/dns/nta.h
+++ b/lib/dns/include/dns/nta.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015  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/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 6ff7e4b20cdf1f32561a3b8c89a0cc67795ef4e3..9136267466dbb87b283dace4604be0093631f069 100644 (file)
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/nta.c b/lib/dns/nta.c
index c78a00d4d3111bf6dc2dc9f2d7b41de526ad8b13..36542cd27346b8c67486e029a0c85550357379b3 100644 (file)
--- a/lib/dns/nta.c
+++ b/lib/dns/nta.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015  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/dns/view.c b/lib/dns/view.c
index 717d6caed3b5c78ee612244cdeba82e35a2641b2..7e173a7d642674e18fa1fbc52daf4f4caa994af3 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -2083,7 +2083,7 @@ dns_view_saventa(dns_view_t *view) {
                result = ISC_R_SUCCESS;
                goto cleanup;
        } else
-               CHECK(result);
+               CHECK(result);
 
        result = dns_ntatable_save(ntatable, fp);
        if (result == ISC_R_NOTFOUND) {

diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
index b5bdab748636763b3c96e793e1894331f1f576fd..caa31b4f65750d0c955a8253bd2be09db9a3ca1a 100644 (file)
--- a/lib/isc/unix/time.c
+++ b/lib/isc/unix/time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c
index b02ddf11b8f0463ed1c51f6cafb99174cd600588..3f145a5d21c575aced438f9b225b58944b675630 100644 (file)
--- a/lib/isc/win32/time.c
+++ b/lib/isc/win32/time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2009, 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2009, 2012-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any