[1213] Miscellaneous corrections to names and content

17 files changed, 34 insertions, 76 deletions

diff --git a/tests/system/ixfr/in-1/ns1/named_nonotify.conf b/tests/system/ixfr/in-1/ns1/named_nonotify.conf
index c206266ddd..28413b59cd 100644
--- a/tests/system/ixfr/in-1/ns1/named_nonotify.conf
+++ b/tests/system/ixfr/in-1/ns1/named_nonotify.conf
@@ -30,7 +30,7 @@ options {
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion no;
-    ixfr-from-differences yes;
+	ixfr-from-differences yes;
 	notify no;
 };
 
diff --git a/tests/system/ixfr/in-1/ns1/named_notify.conf b/tests/system/ixfr/in-1/ns1/named_notify.conf
index c69310507e..5dbef82c11 100644
--- a/tests/system/ixfr/in-1/ns1/named_notify.conf
+++ b/tests/system/ixfr/in-1/ns1/named_notify.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-include ".../../../common/rndc.key";
+include "../../../common/rndc.key";
 
 controls {
         inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
@@ -30,9 +30,9 @@ options {
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion no;
-    ixfr-from-differences yes;
+	ixfr-from-differences yes;
 	notify explicit;
-    also-notify { 10.53.0.2; };
+	also-notify { 10.53.0.2; };
 };
 
 zone "example" {
diff --git a/tests/system/ixfr/in-1/setup.sh.in b/tests/system/ixfr/in-1/setup.sh.in
index cbe6f7e251..36e104e097 100644
--- a/tests/system/ixfr/in-1/setup.sh.in
+++ b/tests/system/ixfr/in-1/setup.sh.in
@@ -18,14 +18,12 @@
 . @abs_top_builddir@/tests/system/conf.sh
 
 # Clean up from last time
-
 sh clean.sh
 
-# Set up the initial version of the IXFR server - Load an old version of the zone.
-
+# Set up the initial version of the IXFR server - load the n-4 version of the
+# zone.  The configuration file enables IXFR and disabled notifies.
 cp -f ns1/named_nonotify.conf ns1/named.conf
 cp -f $IXFR_TOP/largezone_n-4.db ns1/zone.db
 
 # Set up the IXFR client - load the same version of the zone.
-
-${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-6.db
+${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-4.db
diff --git a/tests/system/ixfr/in-1/tests.sh b/tests/system/ixfr/in-1/tests.sh
index 23dc9a24ae..fe8742757c 100644
--- a/tests/system/ixfr/in-1/tests.sh
+++ b/tests/system/ixfr/in-1/tests.sh
@@ -19,7 +19,7 @@
 # This script performs the first IXFR-IN test.  A BIND 9 nameserver (the
 # "server") contains a version of the zone (version N) and two previous
 # versions, N-2 and N-4.  A BIND 10 nameserver (the "client") is loaded with
-# version N-2 of the zone.  A NOTIFY is sent to it, and it is expected that
+# version N-4 of the zone.  A NOTIFY is sent to it, and it is expected that
 # it will send an IXFR to the server and update itself with the latest version
 # of the zone.  (The changes are such that the update should be in the form of
 # a single UDP packet.)
diff --git a/tests/system/ixfr/in-2/ns1/named_nonotify.conf b/tests/system/ixfr/in-2/ns1/named_nonotify.conf
index c206266ddd..28413b59cd 100644
--- a/tests/system/ixfr/in-2/ns1/named_nonotify.conf
+++ b/tests/system/ixfr/in-2/ns1/named_nonotify.conf
@@ -30,7 +30,7 @@ options {
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion no;
-    ixfr-from-differences yes;
+	ixfr-from-differences yes;
 	notify no;
 };
 
diff --git a/tests/system/ixfr/in-2/ns1/named_notify.conf b/tests/system/ixfr/in-2/ns1/named_notify.conf
index bfc7b3ba39..5dbef82c11 100644
--- a/tests/system/ixfr/in-2/ns1/named_notify.conf
+++ b/tests/system/ixfr/in-2/ns1/named_notify.conf
@@ -30,9 +30,9 @@ options {
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion no;
-    ixfr-from-differences yes;
+	ixfr-from-differences yes;
 	notify explicit;
-    also-notify { 10.53.0.2; };
+	also-notify { 10.53.0.2; };
 };
 
 zone "example" {
diff --git a/tests/system/ixfr/in-2/setup.sh b/tests/system/ixfr/in-2/setup.sh
deleted file mode 100755
index 2304999c1d..0000000000
--- a/tests/system/ixfr/in-2/setup.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2001, 2002  Internet Software Consortium.
-#
-# 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.
-
-. /home/stephen/bind10/tests/system/conf.sh
-
-# Clean up from last time
-
-sh clean.sh
-
-# Set up the initial version of the IXFR server - Load an old version of the zone.
-
-cp -f ns1/named_nonotify.conf ns1/named.conf
-cp -f $IXFR_TOP/largezone_n-4.db ns1/zone.db
-
-# Set up the IXFR client - load the same version of the zone.
-
-${B10_LOADZONE} -o . -d ./nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-4.db
diff --git a/tests/system/ixfr/in-2/setup.sh.in b/tests/system/ixfr/in-2/setup.sh.in
index ac2d78d557..4734ac162d 100644
--- a/tests/system/ixfr/in-2/setup.sh.in
+++ b/tests/system/ixfr/in-2/setup.sh.in
@@ -18,14 +18,12 @@
 . @abs_top_builddir@/tests/system/conf.sh
 
 # Clean up from last time
-
 sh clean.sh
 
-# Set up the initial version of the IXFR server - Load an old version of the zone.
-
+# Set up the initial version of the IXFR server - load the n-6 version of the
+# zone.  The configuration file enables IXFR and disabled notifies.
 cp -f ns1/named_nonotify.conf ns1/named.conf
-cp -f $IXFR_TOP/largezone_n-4.db ns1/zone.db
-
-# Set up the IXFR client - load the same version of the zone.
+cp -f $IXFR_TOP/largezone_n-6.db ns1/zone.db
 
-${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-4.db
+# Set up the IXFR client - load an earlier version of the zone
+${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-6.db
diff --git a/tests/system/ixfr/in-2/tests.sh b/tests/system/ixfr/in-2/tests.sh
index 8abdde58b3..02fa35c233 100644
--- a/tests/system/ixfr/in-2/tests.sh
+++ b/tests/system/ixfr/in-2/tests.sh
@@ -17,18 +17,24 @@
 
 # \file
 # This script performs the first IXFR-IN test.  A BIND 9 nameserver (the
-# "server") contains a version of the zone (version N) and two previous
-# versions, N-2 and N-4.  A BIND 10 nameserver (the "client") is loaded with
-# version N-2 of the zone.  A NOTIFY is sent to it, and it is expected that
+# "server") contains a version of the zone (version N) and three previous
+# versions, N-2, N-4 and N-6.  A BIND 10 nameserver (the "client") is loaded
+# with version N-6 of the zone.  A NOTIFY is sent to it, and it is expected that
 # it will send an IXFR to the server and update itself with the latest version
-# of the zone.  (The changes are such that the update should be in the form of
-# a single UDP packet.)
-#
+# of the zone.  (The changes are such that the update will have to take place
+# over TCP.)
+
+# On entry, the IXFR server is at version N-6.  The common tests assume that
+# it is an N-4, so update it.
+echo "I:updating IXFR-server $SERVER_NAME to suitable start version"
+update_server_zone $SERVER_NAME $SERVER_IP $IXFR_TOP/largezone_n-4.db
+status=$?
+
 # The pre-requisites for this test are the same as for the common tests, so
 # we can execute that directly.
 
 . ../common_tests.sh
-status=$?
+status=`expr $status + $?`
 
 # TODO: Check the BIND 10 log, looking for the IXFR messages that indicate that
 # it has initiated an IXFR and that it received the update via TCP.
diff --git a/tests/system/ixfr/in-3/clean.sh b/tests/system/ixfr/in-3/clean.sh
index 8a5e8691aa..d10b386b1a 100644
--- a/tests/system/ixfr/in-3/clean.sh
+++ b/tests/system/ixfr/in-3/clean.sh
@@ -17,7 +17,6 @@
 
 # Clean up after zone transfer tests.
 
-rm -f ns1/named.conf
 rm -f ns1/zone.db
 rm -f ns1/named.memstats
 
diff --git a/tests/system/ixfr/in-3/ns1/named.conf b/tests/system/ixfr/in-3/ns1/named.conf
index e297d43d43..1ae5530200 100644
--- a/tests/system/ixfr/in-3/ns1/named.conf
+++ b/tests/system/ixfr/in-3/ns1/named.conf
@@ -30,9 +30,9 @@ options {
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion no;
-    ixfr-from-differences no;
+	ixfr-from-differences no;
 	notify explicit;
-    also-notify { 10.53.0.2; };
+	also-notify { 10.53.0.2; };
 };
 
 zone "example" {
diff --git a/tests/system/ixfr/in-3/setup.sh.in b/tests/system/ixfr/in-3/setup.sh.in
index 06172033df..f3a746d60e 100644
--- a/tests/system/ixfr/in-3/setup.sh.in
+++ b/tests/system/ixfr/in-3/setup.sh.in
@@ -16,16 +16,13 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 . @abs_top_builddir@/tests/system/conf.sh
-
 # Clean up from last time
 
 sh clean.sh
 
 # Set up the initial version of the IXFR server - load the latest version of
 # the zone.
-
 cp -f $IXFR_TOP/largezone_n-0.db ns1/zone.db
 
 # Set up the IXFR client - load a previous version of the zone.
-
 ${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-2.db
diff --git a/tests/system/ixfr/in-3/tests.sh b/tests/system/ixfr/in-3/tests.sh
index 9dd7c1d527..20839e24d2 100644
--- a/tests/system/ixfr/in-3/tests.sh
+++ b/tests/system/ixfr/in-3/tests.sh
@@ -37,11 +37,6 @@ echo "I:SOA serial of IXFR client $CLIENT_NAME is $old_client_serial"
 # Do this by allowing notifies and then triggering a re-notification of the
 # server.
 echo "I:notifying IXFR-client $CLIENT_NAME of presence of new version of zone"
-cp ns1/named_notify.conf ns1/named.conf
-
-do_rndc $SERVER_NAME $SERVER_IP reconfig
-status=`expr $status + $?`
-
 do_rndc $SERVER_NAME $SERVER_IP notify example
 status=`expr $status + $?`
 
diff --git a/tests/system/ixfr/in-4/clean.sh b/tests/system/ixfr/in-4/clean.sh
index 8a5e8691aa..d10b386b1a 100644
--- a/tests/system/ixfr/in-4/clean.sh
+++ b/tests/system/ixfr/in-4/clean.sh
@@ -17,7 +17,6 @@
 
 # Clean up after zone transfer tests.
 
-rm -f ns1/named.conf
 rm -f ns1/zone.db
 rm -f ns1/named.memstats
 
diff --git a/tests/system/ixfr/in-4/ns1/named.conf b/tests/system/ixfr/in-4/ns1/named.conf
index e297d43d43..1ae5530200 100644
--- a/tests/system/ixfr/in-4/ns1/named.conf
+++ b/tests/system/ixfr/in-4/ns1/named.conf
@@ -30,9 +30,9 @@ options {
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion no;
-    ixfr-from-differences no;
+	ixfr-from-differences no;
 	notify explicit;
-    also-notify { 10.53.0.2; };
+	also-notify { 10.53.0.2; };
 };
 
 zone "example" {
diff --git a/tests/system/ixfr/in-4/setup.sh.in b/tests/system/ixfr/in-4/setup.sh.in
index c515405a65..a10a19437d 100644
--- a/tests/system/ixfr/in-4/setup.sh.in
+++ b/tests/system/ixfr/in-4/setup.sh.in
@@ -16,17 +16,14 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 . @abs_top_builddir@/tests/system/conf.sh
-
 # Clean up from last time
 
 sh clean.sh
 
 # Set up the initial version of the IXFR server - load the latest version of
 # the zone.
-
 cp -f $IXFR_TOP/largezone_n-0.db ns1/zone.db
 
 # Set up the IXFR client - load a previous version of the zone with a short
 # refresh time.
-
 ${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-2_refresh.db
diff --git a/tests/system/ixfr/ixfr_init.sh b/tests/system/ixfr/ixfr_init.sh.in
index 5079de98a3..8925f4a6bc 100755..100644
--- a/tests/system/ixfr/ixfr_init.sh
+++ b/tests/system/ixfr/ixfr_init.sh.in
@@ -19,7 +19,7 @@
 # includes the main configuration script that defines the various environment
 # variables, as well as defining useful shell subroutines.
 
-. /home/stephen/bind10/tests/system/conf.sh
+. @abs_top_builddir@/tests/system/conf.sh
 
 # Useful symbols used in the IXFR tests.