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 9cb5e12c5285769faf669bf0a4e2d6f492566f09..2333bc0df2ef8fcda78fa373d0c45e235bfc6882 100644 (file)
--- 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 2fdb637f1dd3a9de77007fde5c80d35fdb4d4b8a..49926ccf001ca02f6888965d27f6f1dac7375c1a 100644 (file)
--- 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";