update copyright notice

diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index b826048023c55cc10fced97762e0df6b03e8118a..d8eca35b92a531786e322a81a4aa0a8b5fd06c10 100755 (executable)
--- a/bin/tests/system/masterformat/clean.sh
+++ b/bin/tests/system/masterformat/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005, 2007, 2011, 2012  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
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.11 2012/02/13 23:46:23 marka Exp $
+# $Id: clean.sh,v 1.12 2012/02/14 23:47:15 tbox Exp $
 
 rm -f named-compilezone
 rm -f ns1/example.db.raw*

diff --git a/bin/tests/system/masterformat/ns1/compile.sh b/bin/tests/system/masterformat/ns1/compile.sh
index 886ea5e577968c77068eac8e6631ccc80173dd21..02ae0b06b2b13814c4fc161ae2b1f24387913da7 100755 (executable)
--- a/bin/tests/system/masterformat/ns1/compile.sh
+++ b/bin/tests/system/masterformat/ns1/compile.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-2007, 2011, 2012  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
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: compile.sh,v 1.10 2012/02/13 23:46:24 marka Exp $
+# $Id: compile.sh,v 1.11 2012/02/14 23:47:15 tbox Exp $
 
 ../named-compilezone -D -F raw -o example.db.raw example \
         example.db > /dev/null 2>&1

diff --git a/bin/tests/system/masterformat/ns1/large.db.in b/bin/tests/system/masterformat/ns1/large.db.in
index 13cc81d2fb6c9228c265c9580b1ecf83852d8384..b97f12ab89a132ab9b23d16fad62ec6a534f25c0 100644 (file)
--- a/bin/tests/system/masterformat/ns1/large.db.in
+++ b/bin/tests/system/masterformat/ns1/large.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2012  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: large.db.in,v 1.2 2012/02/13 23:46:24 marka Exp $
+; $Id: large.db.in,v 1.3 2012/02/14 23:47:15 tbox Exp $
 
 $TTL 1D
 

diff --git a/bin/tests/system/masterformat/ns1/named.conf b/bin/tests/system/masterformat/ns1/named.conf
index 8471f8ce9e1660e21cfb99715023ec1129f12349..6232b6aac9621bae346517d6e6476ef58829d4b6 100644 (file)
--- a/bin/tests/system/masterformat/ns1/named.conf
+++ b/bin/tests/system/masterformat/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2007, 2011, 2012  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.8 2012/02/13 23:46:24 marka Exp $ */
+/* $Id: named.conf,v 1.9 2012/02/14 23:47:15 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/masterformat/ns2/named.conf b/bin/tests/system/masterformat/ns2/named.conf
index 45c21e94b7ab3c7f3c5998f23b35f3b348b03040..07c2c828b2db5793c11662e3be95d51077bbd5b5 100644 (file)
--- a/bin/tests/system/masterformat/ns2/named.conf
+++ b/bin/tests/system/masterformat/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2007, 2011, 2012  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.7 2012/02/13 23:46:24 marka Exp $ */
+/* $Id: named.conf,v 1.8 2012/02/14 23:47:15 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index fce032bbbeb0b68a39feda00141bbdab791712a0..beac865a2fa3d9a7e764722db1d916cb61ead959 100755 (executable)
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-2007, 2011, 2012  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
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.10 2012/02/13 23:46:23 marka Exp $
+# $Id: setup.sh,v 1.11 2012/02/14 23:47:15 tbox Exp $
 
 rm -f named-compilezone
 ln -s $CHECKZONE named-compilezone

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 1711058dad0dd663d587ce076b5f2271a0dbcfe5..cf647f9ca80eb26835de1f056564f9de84e4fcfa 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.447 2012/02/14 00:22:54 marka Exp $ */
+/* $Id: resolver.c,v 1.448 2012/02/14 23:47:15 tbox Exp $ */
 
 /*! \file */
 
@@ -5513,7 +5513,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
        log_ns_ttl(fctx, "noanswer_response");
 
        if (ns_rdataset != NULL && dns_name_equal(&fctx->domain, ns_name) &&
-            !dns_name_equal(ns_name, dns_rootname))
+           !dns_name_equal(ns_name, dns_rootname))
                trim_ns_ttl(fctx, ns_name, ns_rdataset);
 
        /*
@@ -6210,7 +6210,7 @@ answer_response(fetchctx_t *fctx) {
        log_ns_ttl(fctx, "answer_response");
 
        if (ns_rdataset != NULL && dns_name_equal(&fctx->domain, ns_name) &&
-            !dns_name_equal(ns_name, dns_rootname))
+           !dns_name_equal(ns_name, dns_rootname))
                trim_ns_ttl(fctx, ns_name, ns_rdataset);
 
        return (result);