update copyright notice

diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index 50fcf4f05fac836d274e855461b0485a86960a50..0c3960bcc38b123d2675fa771f298606620f3157 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  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005, 2007, 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.5.476.1 2012/02/14 00:14:27 marka Exp $
+# $Id: clean.sh,v 1.5.476.2 2012/02/14 23:46:05 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 0fb0b98d0bec01363e3b5ee4bcb80db4e2ae972f..23a50676567b3b03445a650de5a3fefc16f503c1 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  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-2007, 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.6.558.1 2012/02/14 00:14:27 marka Exp $
+# $Id: compile.sh,v 1.6.558.2 2012/02/14 23:46:06 tbox Exp $
 
 ../named-compilezone -D -F raw -o example.db.raw example example.db
 ../named-compilezone -D -F raw -o large.db.raw large large.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 8499937894c2d6312ee70d373e75059bc054a360..b7b2f6b000761f4e103038b6214c051780b835f0 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.6.2 2012/02/14 00:14:28 marka Exp $
+; $Id: large.db.in,v 1.2.6.3 2012/02/14 23:46:06 tbox Exp $
 
 $TTL 1D
 

diff --git a/bin/tests/system/masterformat/ns1/named.conf b/bin/tests/system/masterformat/ns1/named.conf
index a740fab2d55a1217470ed1124398bf79d8a711bc..67a0477164b50341922391dbea3485a8a0ecddc7 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  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2007, 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.4.558.1 2012/02/14 00:14:28 marka Exp $ */
+/* $Id: named.conf,v 1.4.558.2 2012/02/14 23:46:06 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/masterformat/ns2/named.conf b/bin/tests/system/masterformat/ns2/named.conf
index 6584b1c887cbb3d7ee289e332badf313ade697ba..cb8275025a933bb00c420da7675f075e44539fea 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  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2007, 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.4.558.1 2012/02/14 00:14:28 marka Exp $ */
+/* $Id: named.conf,v 1.4.558.2 2012/02/14 23:46:06 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index 73407a888f3ebbd0da9a31fc06195e7d50bacb63..6a3fda8dadc5e692ca7c8cfe88900d28319adc28 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005, 2007, 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: tests.sh,v 1.4.558.1 2012/02/14 00:14:27 marka Exp $
+# $Id: tests.sh,v 1.4.558.2 2012/02/14 23:46:06 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -54,7 +54,7 @@ exit $status
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.4.558.1 2012/02/14 00:14:27 marka Exp $
+# $Id: tests.sh,v 1.4.558.2 2012/02/14 23:46:06 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/lib/dns/master.c b/lib/dns/master.c
index 0e17ce4bbdabde5582eb27520fd3200ef5521eff..277763dbaa72cf2d1f3730daa0a3ea33db1c4f6a 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.178.104.3 2012/02/14 00:14:28 marka Exp $ */
+/* $Id: master.c,v 1.178.104.4 2012/02/14 23:46:06 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 7f51413ba151b0ace503a6c2aa31b211a0283394..fa3f2d07b481e621220bc568b92509fae68d1ce2 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.413.14.27 2012/02/14 00:26:41 marka Exp $ */
+/* $Id: resolver.c,v 1.413.14.28 2012/02/14 23:46:06 tbox Exp $ */
 
 /*! \file */
 
@@ -5568,7 +5568,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);
 
        /*
@@ -6265,7 +6265,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);