fix secondkey test, properly

diff --git a/bin/tests/system/rndc/ns2/secondkey.conf b/bin/tests/system/rndc/ns2/secondkey.conf
new file mode 100644 (file)
index 0000000..99ecf54
--- /dev/null
+++ b/bin/tests/system/rndc/ns2/secondkey.conf
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001  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.
+ */
+
+/* $Id: rndc.conf,v 1.5 2007/06/19 23:47:01 tbox Exp $ */
+
+options {
+        default-key     "secondkey";
+};
+
+key secondkey {
+        secret "abcd1234abcd8765";
+        algorithm hmac-md5;
+};

diff --git a/bin/tests/system/rndc/ns2/secondkey.key b/bin/tests/system/rndc/ns2/secondkey.key
deleted file mode 100644 (file)
index 2e8be57..0000000
--- a/bin/tests/system/rndc/ns2/secondkey.key
+++ /dev/null
@@ -1,4 +0,0 @@
-key secondkey {
-        secret "abcd1234abcd8765";
-        algorithm hmac-md5;
-};

diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index 491eb64ad41e0ac706bad8c7e181c3018318aedb..6421033d26ef94846a60d5f68f04979a6c1037dd 100644 (file)
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -31,7 +31,7 @@ status=`expr $status + $ret`
 
 echo "I:test using second key"
 ret=0
-$RNDC -s 10.53.0.2 -p 9953 -c ../common/rndc.conf -k ns2/secondkey.key status > /dev/null || ret=1
+$RNDC -s 10.53.0.2 -p 9953 -c ns2/secondkey.conf status > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 

diff --git a/util/copyrights b/util/copyrights
index db943cc3a6ee54b070183113a99cc2309cf70145..842184a65ff99c9a60c12fb5f0fb6055503ec1df 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -826,11 +826,11 @@
 ./bin/tests/system/resolver/prereq.sh          SH      2000,2001,2004,2007
 ./bin/tests/system/resolver/setup.sh           SH      2010,2011,2012
 ./bin/tests/system/resolver/tests.sh           SH      2000,2001,2004,2007,2010,2011,2012
-./bin/tests/system/rndc/clean.sh               SH      2012
-./bin/tests/system/rndc/ns2/named.conf         CONF-C  2012
-./bin/tests/system/rndc/ns2/secondkey.key      X       2012
-./bin/tests/system/rndc/setup.sh               SH      2012
-./bin/tests/system/rndc/tests.sh               SH      2012
+./bin/tests/system/rndc/clean.sh               SH      2011,2012
+./bin/tests/system/rndc/ns2/named.conf         CONF-C  2011,2012
+./bin/tests/system/rndc/ns2/secondkey.conf     CONF-C  2012
+./bin/tests/system/rndc/setup.sh               SH      2011,2012
+./bin/tests/system/rndc/tests.sh               SH      2011,2012
 ./bin/tests/system/rrsetorder/clean.sh         SH      2006,2007,2008,2011,2012
 ./bin/tests/system/rrsetorder/dig.out.fixed.good       X       2006
 ./bin/tests/system/rrsetorder/dig.out.random.good1     X       2006