update copyright notice

diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index 4091e5f4782f47caf9570b3f0fac53addcc92dad..3796daed8439e652736b4dad9aff3579f7a1638b 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.10.20.1 2012/02/13 23:51:50 marka Exp $
+# $Id: clean.sh,v 1.10.20.2 2012/02/14 23:46:48 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 de3ce122f27dd2d4fa7afeadb1b9ec2a5794e01d..a611fef13e9f0003bc00249a8b0434783a21d03a 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.9.20.1 2012/02/13 23:51:51 marka Exp $
+# $Id: compile.sh,v 1.9.20.2 2012/02/14 23:46:48 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 19c076d3c17d40cefd27d758b78ee33a691904fe..b87b0b03866422541192b94aaa5f425ad5e0a3a0 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.2.2 2012/02/13 23:51:51 marka Exp $
+; $Id: large.db.in,v 1.2.2.3 2012/02/14 23:46:49 tbox Exp $
 
 $TTL 1D
 

diff --git a/bin/tests/system/masterformat/ns1/named.conf b/bin/tests/system/masterformat/ns1/named.conf
index 0b57454385fc5eaef1f55649c72e57f4c9468367..4dadfc82b117125ea005db58766d0f640b6b5cf8 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.7.36.1 2012/02/13 23:51:51 marka Exp $ */
+/* $Id: named.conf,v 1.7.36.2 2012/02/14 23:46:49 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/masterformat/ns2/named.conf b/bin/tests/system/masterformat/ns2/named.conf
index b1c5d1fbd7c81e58de196e38af73cd41f74f1f53..71d16c07a88a2552fbc5a54bf45fda8c66aed6fe 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.6.98.1 2012/02/13 23:51:51 marka Exp $ */
+/* $Id: named.conf,v 1.6.98.2 2012/02/14 23:46:49 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index d056a4e2cd81d045200e762f6f19b746b844bec1..b39927f0d79da6c26c599a4933c62519b71f4d76 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.9.36.1 2012/02/13 23:51:50 marka Exp $
+# $Id: setup.sh,v 1.9.36.2 2012/02/14 23:46:48 tbox Exp $
 
 rm -f named-compilezone
 ln -s $CHECKZONE named-compilezone

diff --git a/lib/dns/master.c b/lib/dns/master.c
index a136636fa56880e7ceb583ceabaa1f163449a959..6ac1c61d9597b6064cd521c0d75e2e3f3e2cfb85 100644 (file)
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011, 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: master.c,v 1.181.36.1 2012/02/13 23:51:51 marka Exp $ */
+/* $Id: master.c,v 1.181.36.2 2012/02/14 23:46:49 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index e95845be14658d969ed6eeb34db6542485abac72..4bd36066157dd1cd086328a525cf4dd253032708 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.446.38.1 2012/02/14 00:24:56 marka Exp $ */
+/* $Id: resolver.c,v 1.446.38.2 2012/02/14 23:46:49 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);