From: ckb <ckb@isc.org>
Date: Thu, 26 Jul 2012 05:05:09 +0000 (-0500)
Subject: removed spurious variables added by merge, added config options to dnssec test
X-Git-Tag: v9.7.7rc1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37fcd0d13b1fc7e5b1d617b77d3045b53b15aca6;p=thirdparty%2Fbind9.git

removed spurious variables added by merge, added config options to dnssec test
---

diff --git a/bin/named/query.c b/bin/named/query.c
index 9cb5e12c528..2333bc0df2e 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -2358,8 +2358,6 @@ mark_secure(ns_client_t *client, dns_db_t *db, dns_name_t *name,
 	isc_result_t result;
 	dns_dbnode_t *node = NULL;
 
-	dns_clientinfomethods_t cm;
-	dns_clientinfo_t ci;
 	isc_stdtime_t now;
 
 	rdataset->trust = dns_trust_secure;
diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf
index 2fdb637f1dd..49926ccf001 100644
--- a/bin/tests/system/dnssec/ns3/named.conf
+++ b/bin/tests/system/dnssec/ns3/named.conf
@@ -35,6 +35,15 @@ options {
 	dnssec-validation yes;
 };
 
+key rndc_key {
+        secret "1234abcd8765";
+        algorithm hmac-md5;
+};
+
+controls {
+        inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
+};
+
 zone "." {
 	type hint;
 	file "../../common/root.hint";