update copyright notice

diff --git a/bin/named/update.c b/bin/named/update.c
index 56236b0ecebf9c9def479858f6aae771fb26fd66..c4609dc0cc42d508c481a9d9d9d2d85b7d6ebaba 100644 (file)
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.176.4.7 2010/12/07 03:01:37 marka Exp $ */
+/* $Id: update.c,v 1.176.4.8 2010/12/07 23:46:26 tbox Exp $ */
 
 #include <config.h>
 
@@ -3187,17 +3187,17 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
                        next = ISC_LIST_NEXT(tuple, link);
        }
 
-       /*
-        * Preserve any ongoing changes from a BIND 9.6.x upgrade.
+       /*
+        * Preserve any ongoing changes from a BIND 9.6.x upgrade.
         *
         * Any NSEC3PARAM records with flags other than OPTOUT named
         * in managing and should not be touched so revert such changes
         * taking into account any TTL change of the NSEC3PARAM RRset.
-        */
-       for (tuple = ISC_LIST_HEAD(temp_diff.tuples);
-            tuple != NULL; tuple = next) {
-               next = ISC_LIST_NEXT(tuple, link);
-               if ((tuple->rdata.data[1] & ~DNS_NSEC3FLAG_OPTOUT) != 0) {
+        */
+       for (tuple = ISC_LIST_HEAD(temp_diff.tuples);
+            tuple != NULL; tuple = next) {
+               next = ISC_LIST_NEXT(tuple, link);
+               if ((tuple->rdata.data[1] & ~DNS_NSEC3FLAG_OPTOUT) != 0) {
                        /*
                         * If we havn't had any adds then the tuple->ttl must
                         * be the original ttl and should be used for any
@@ -3207,16 +3207,16 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
                                ttl = tuple->ttl;
                                ttl_good = ISC_TRUE;
                        }
-                       op = (tuple->op == DNS_DIFFOP_DEL) ?
-                            DNS_DIFFOP_ADD : DNS_DIFFOP_DEL;
-                       CHECK(dns_difftuple_create(diff->mctx, op, name,
-                                                  ttl, &tuple->rdata,
+                       op = (tuple->op == DNS_DIFFOP_DEL) ?
+                            DNS_DIFFOP_ADD : DNS_DIFFOP_DEL;
+                       CHECK(dns_difftuple_create(diff->mctx, op, name,
+                                                  ttl, &tuple->rdata,
                                                   &newtuple));
-                       CHECK(do_one_tuple(&newtuple, db, ver, diff));
-                       ISC_LIST_UNLINK(temp_diff.tuples, tuple, link);
-                       dns_diff_appendminimal(diff, &tuple);
-               }
-       }
+                       CHECK(do_one_tuple(&newtuple, db, ver, diff));
+                       ISC_LIST_UNLINK(temp_diff.tuples, tuple, link);
+                       dns_diff_appendminimal(diff, &tuple);
+               }
+       }
 
        /*
         * We now have just the actual changes to the NSEC3PARAM RRset.

diff --git a/bin/tests/system/nsupdate/ns3/example.db.in b/bin/tests/system/nsupdate/ns3/example.db.in
index ec764bb7741ded8e166076eac4988fb8464ae8a3..0094ed3ef9578a9ec7b413b791487e23dac6d29b 100644 (file)
--- a/bin/tests/system/nsupdate/ns3/example.db.in
+++ b/bin/tests/system/nsupdate/ns3/example.db.in
@@ -1,3 +1,19 @@
+; Copyright (C) 2010  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.
+
+; $Id: example.db.in,v 1.2.2.3 2010/12/07 23:46:26 tbox Exp $
+
 example. 10 IN SOA example. hostmaster.example. 1 3600 900 2419200 3600
 example. 10 IN NS example.
 example. 10 IN A 10.53.0.3

diff --git a/bin/tests/system/nsupdate/ns3/named.conf b/bin/tests/system/nsupdate/ns3/named.conf
index 89b8f3bd0d52f8c59a3f1d04783cccd667d4a8d5..60c81981aa3c09165ede1143c409392122a481b1 100644 (file)
--- a/bin/tests/system/nsupdate/ns3/named.conf
+++ b/bin/tests/system/nsupdate/ns3/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2010  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2.2.2 2010/12/07 03:01:38 marka Exp $ */
+/* $Id: named.conf,v 1.2.2.3 2010/12/07 23:46:26 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in b/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in
index f0dc8cefee156900c99796082333aa5e3e22fdf8..e7ff0d79ae3e183e2012441709d7a2d3e934eb15 100644 (file)
--- a/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in
+++ b/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in
@@ -1,3 +1,19 @@
+; Copyright (C) 2010  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.
+
+; $Id: nsec3param.test.db.in,v 1.2.2.3 2010/12/07 23:46:26 tbox Exp $
+
 $TTL 10
 nsec3param.test. IN SOA nsec3param.test. hostmaster.nsec3param.test. 1 3600 900 2419200 3600
 nsec3param.test. IN NS nsec3param.test.

diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index 0708fde4f1c8ec0b09e3a0aafd91e2b494ca5fd9..8026835744a2b88d10ead0266ee877b4c0efa6f2 100644 (file)
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.14.4.1 2010/12/07 03:01:37 marka Exp $
+# $Id: setup.sh,v 1.14.4.2 2010/12/07 23:46:26 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh