1593. [bug] rndc should return "unknown command" to unknown

                        commands. [RT# 10642]

diff --git a/CHANGES b/CHANGES
index 511e5e55db046a6e67a3d4e725e823fb6f582e4d..28b5a9ae81d543cf73b9ca300bc229bac4a8d82c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 1455.   [bug]           <netaddr> missing from server grammar in
                         doc/misc/options. [RT #5616]
 
+1593.  [bug]           rndc should return "unknown command" to unknown
+                       commands. [RT# 10642]
+
        --- 9.2.4rc1 released ---
 
 1592.  [bug]           configure_view() could leak a dispatch. [RT# 10675]

diff --git a/bin/named/control.c b/bin/named/control.c
index 4d3c8cf5d8be68e32fe1eb0343d6c228b6c4538a..a50aa921cb69c28e005136461c11c95c8c792060 100644 (file)
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.c,v 1.7.2.3 2004/03/09 06:09:17 marka Exp $ */
+/* $Id: control.c,v 1.7.2.4 2004/04/06 01:38:47 marka Exp $ */
 
 #include <config.h>
 
@@ -26,6 +26,8 @@
 #include <isc/mem.h>
 #include <isc/util.h>
 
+#include <dns/result.h>
+
 #include <isccc/alist.h>
 #include <isccc/cc.h>
 #include <isccc/result.h>
@@ -117,7 +119,7 @@ ns_control_docommand(isccc_sexpr_t *message, isc_buffer_t *text) {
                              NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,
                              "unknown control channel command '%s'",
                              command);
-               result = ISC_R_NOTIMPLEMENTED;
+               result = DNS_R_UNKNOWNCOMMAND;
        }
 
        return (result);

diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index 91c6fd66f06d62442becde1bba50ed51ba254911..bb4a9c22c403db18fc84ce2a13c957a19180552c 100644 (file)
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.81.2.9 2004/03/09 06:11:21 marka Exp $ */
+/* $Id: result.h,v 1.81.2.10 2004/04/06 01:38:47 marka Exp $ */
 
 #ifndef DNS_RESULT_H
 #define DNS_RESULT_H 1
@@ -127,9 +127,9 @@
 #define DNS_R_BADOWNERNAME             (ISC_RESULTCLASS_DNS + 96)
 #define DNS_R_BADNAME                  (ISC_RESULTCLASS_DNS + 97)
 #define DNS_R_DYNAMIC                  (ISC_RESULTCLASS_DNS + 98)
+#define DNS_R_UNKNOWNCOMMAND           (ISC_RESULTCLASS_DNS + 99)
 
-
-#define DNS_R_NRESULTS                 99      /* Number of results */
+#define DNS_R_NRESULTS                 100     /* Number of results */
 
 /*
  * DNS wire format rcodes.

diff --git a/lib/dns/result.c b/lib/dns/result.c
index 722f39cad2852819ac1e14f5dbd3ff12aff9bbd3..ec17c248b6e1a272c8f8b1504b204c8e4fb40472 100644 (file)
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.90.2.11 2004/03/09 06:11:07 marka Exp $ */
+/* $Id: result.c,v 1.90.2.12 2004/04/06 01:38:47 marka Exp $ */
 
 #include <config.h>
 
@@ -140,10 +140,11 @@ static const char *text[DNS_R_NRESULTS] = {
        "empty wild",                           /* 93 DNS_R_EMPTYWILD        */
        "bad bitmap",                           /* 94 DNS_R_BADBITMAP        */
 
-       "from wildcard",                        /* DNS_R_FROMWILDCARD        */
-       "bad owner name (check-names)",         /* DNS_R_BADOWNERNAME        */
-       "bad name (check-names)",               /* DNS_R_BADNAME             */
-       "dynamic zone"                          /* DNS_R_DYNAMIC             */
+       "from wildcard",                        /* 95 DNS_R_FROMWILDCARD     */
+       "bad owner name (check-names)",         /* 96 DNS_R_BADOWNERNAME     */
+       "bad name (check-names)",               /* 97 DNS_R_BADNAME          */
+       "dynamic zone",                         /* 98 DNS_R_DYNAMIC          */
+       "unknown command"                       /* 99 DNS_R_UNKNOWNCOMMAND   */
 };
 
 static const char *rcode_text[DNS_R_NRCODERESULTS] = {