pullup:

 461.   [bug]           Specifying an unknown key in the "keys" clause of the
                        "controls" statement caused a NULL pointer dereference.
                        [RT #316]

diff --git a/CHANGES b/CHANGES
index 004b24cee00c445ee8a5651f8c09826a3f4b9f95..f5804f5ed7980919acf0338038499e80aff482bf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+ 461.  [bug]           Specifying an unknown key in the "keys" clause of the
+                       "controls" statement caused a NULL pointer dereference.
+                       [RT #316]
+
  456.  [bug]           Stub zones were not resetting the refresh and expire
                        counters, loadtime or clearing the DNS_ZONE_REFRESH
                        (refresh in progress) flag upon successful update.

diff --git a/bin/named/omapiconf.c b/bin/named/omapiconf.c
index 61ee09334d0d463fbdf062f4e67a9af544476845..a47a088861a4cb767782bf01ac3de95e388aec22 100644 (file)
--- a/bin/named/omapiconf.c
+++ b/bin/named/omapiconf.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: omapiconf.c,v 1.4.2.5 2000/08/26 02:13:58 bwelling Exp $ */
+/* $Id: omapiconf.c,v 1.4.2.6 2000/09/15 16:24:12 gson Exp $ */
 
 /*
  * Principal Author: DCL
@@ -234,9 +234,9 @@ register_keys(dns_c_ctrl_t *control, dns_c_kdeflist_t *keydeflist,
                     if (result != ISC_R_SUCCESS)
                             isc_log_write(ns_g_lctx, ISC_LOGCATEGORY_GENERAL,
                                           NS_LOGMODULE_OMAPI, ISC_LOG_WARNING,
-                                          "couldn't find key %s for"
+                                          "couldn't find key %s for "
                                           "use with command channel %s",
-                                          keydef->keyid, socktext);
+                                          keyid->keyid, socktext);
                     else if (strcasecmp(keydef->algorithm, "hmac-md5") != 0) {
                             isc_log_write(ns_g_lctx, ISC_LOGCATEGORY_GENERAL,
                                           NS_LOGMODULE_OMAPI, ISC_LOG_WARNING,