From 55479af81f5311bfc61bcc0818d3a816bb7cb35a Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Wed, 20 Jun 2012 22:44:06 -0700
Subject: [PATCH] fix secondkey test, properly

---
 bin/tests/system/rndc/ns2/secondkey.conf | 27 ++++++++++++++++++++++++
 bin/tests/system/rndc/ns2/secondkey.key  |  4 ----
 bin/tests/system/rndc/tests.sh           |  2 +-
 util/copyrights                          |  2 +-
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 bin/tests/system/rndc/ns2/secondkey.conf
 delete mode 100644 bin/tests/system/rndc/ns2/secondkey.key

diff --git a/bin/tests/system/rndc/ns2/secondkey.conf b/bin/tests/system/rndc/ns2/secondkey.conf
new file mode 100644
index 0000000000..99ecf54f38
--- /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
index 2e8be57e3d..0000000000
--- 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 b360e520cc..1d1f2c462b 100644
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -227,7 +227,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 c04eccc927..72aa51bc34 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1130,7 +1130,7 @@
 ./bin/tests/system/resolver/tests.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012
 ./bin/tests/system/rndc/clean.sh		SH	2011
 ./bin/tests/system/rndc/ns2/named.conf		CONF-C	2011,2012
-./bin/tests/system/rndc/ns2/secondkey.key	X	2012
+./bin/tests/system/rndc/ns2/secondkey.conf	CONF-C	2012
 ./bin/tests/system/rndc/setup.sh		SH	2011
 ./bin/tests/system/rndc/tests.sh		SH	2011,2012
 ./bin/tests/system/rpz/.gitignore		X	2012