[master] clearer "not found" message for rndc commands

3683.	[cleanup]	Add a more detailed "not found" message to rndc
			commands which specify a zone name. [RT #35059]

(cherry picked from commit bee9a28af0f923c205f76819618ed7ffcf3f6997)
(cherry picked from commit 98a3bd57ca1e7f2b70f8167654566672d12d1cc7)

diff --git a/CHANGES b/CHANGES
index 04773fba52722761a55110c1cbb55665c400a09e..5a683f3e853a046d2b21790a737f6add5c1bf3e0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3683.  [cleanup]       Add a more detailed "not found" message to rndc
+                       commands which specify a zone name. [RT #35059]
+
 3681.  [port]          Update the Windows build system to support feature
                        selection and WIN64 builds.  This is a work in
                        progress. [RT #34160]

diff --git a/bin/named/control.c b/bin/named/control.c
index 2a1a5a8e734e19c73740427808e642c9ed919565..db98cd4c9441690607b248b8864a26458f9f6445 100644 (file)
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -105,7 +105,8 @@ ns_control_docommand(isccc_sexpr_t *message, isc_buffer_t *text) {
        } else if (command_compare(command, NS_COMMAND_REFRESH)) {
                result = ns_server_refreshcommand(ns_g_server, command, text);
        } else if (command_compare(command, NS_COMMAND_RETRANSFER)) {
-               result = ns_server_retransfercommand(ns_g_server, command);
+               result = ns_server_retransfercommand(ns_g_server,
+                                                    command, text);
        } else if (command_compare(command, NS_COMMAND_HALT)) {
 #ifdef HAVE_LIBSCF
                /*
@@ -196,11 +197,11 @@ ns_control_docommand(isccc_sexpr_t *message, isc_buffer_t *text) {
                result = ns_server_validation(ns_g_server, command);
        } else if (command_compare(command, NS_COMMAND_SIGN) ||
                   command_compare(command, NS_COMMAND_LOADKEYS)) {
-               result = ns_server_rekey(ns_g_server, command);
+               result = ns_server_rekey(ns_g_server, command, text);
        } else if (command_compare(command, NS_COMMAND_ADDZONE)) {
                result = ns_server_add_zone(ns_g_server, command);
        } else if (command_compare(command, NS_COMMAND_DELZONE)) {
-               result = ns_server_del_zone(ns_g_server, command);
+               result = ns_server_del_zone(ns_g_server, command, text);
        } else {
                isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
                              NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,

diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index 9982e88e09e44e6b051c667a46e8d87963730769..aa5a76b547210a8ee2007d881361a06cd3e54db8 100644 (file)
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -224,7 +224,8 @@ ns_server_refreshcommand(ns_server_t *server, char *args, isc_buffer_t *text);
  */
 
 isc_result_t
-ns_server_retransfercommand(ns_server_t *server, char *args);
+ns_server_retransfercommand(ns_server_t *server, char *args,
+                           isc_buffer_t *text);
 /*%<
  * Act on a "retransfer" command from the command channel.
  */
@@ -304,7 +305,7 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze, char *args,
  * take place incrementally.
  */
 isc_result_t
-ns_server_rekey(ns_server_t *server, char *args);
+ns_server_rekey(ns_server_t *server, char *args, isc_buffer_t *text);
 
 /*%
  * Dump the current recursive queries.
@@ -334,6 +335,6 @@ ns_server_add_zone(ns_server_t *server, char *args);
  * Deletes a zone from a running process
  */
 isc_result_t
-ns_server_del_zone(ns_server_t *server, char *args);
+ns_server_del_zone(ns_server_t *server, char *args, isc_buffer_t *text);
 
 #endif /* NAMED_SERVER_H */

diff --git a/bin/named/server.c b/bin/named/server.c
index 631681b9ad50cbeff076c4ffbc9ee0aa543a9459..f2fac00e8ab1b991d6b5ef7fb43ce92dd433f7f3 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -372,6 +372,9 @@ end_reserved_dispatches(ns_server_t *server, isc_boolean_t all);
 static void
 newzone_cfgctx_destroy(void **cfgp);
 
+static isc_result_t
+putstr(isc_buffer_t *b, const char *str);
+
 isc_result_t
 add_comment(FILE *fp, const char *viewname);
 
@@ -6181,7 +6184,7 @@ next_token(char **stringp, const char *delim) {
  */
 static isc_result_t
 zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep,
-              const char **zonename)
+              const char **zonename, isc_buffer_t *text)
 {
        char *input, *ptr;
        const char *zonetxt;
@@ -6192,6 +6195,7 @@ zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep,
        isc_buffer_t buf;
        dns_view_t *view = NULL;
        dns_rdataclass_t rdclass;
+       char problem[1024] = "";
 
        REQUIRE(zonep != NULL && *zonep == NULL);
        REQUIRE(zonename == NULL || *zonename == NULL);
@@ -6240,15 +6244,24 @@ zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep,
                                               dns_fixedname_name(&name),
                                               ISC_TF(classtxt == NULL),
                                               rdclass, zonep);
+               if (result == ISC_R_NOTFOUND)
+                       sprintf(problem, "no matching zone '%s' in any view",
+                               zonetxt);
        } else {
                result = dns_viewlist_find(&server->viewlist, viewtxt,
                                           rdclass, &view);
-               if (result != ISC_R_SUCCESS)
+               if (result != ISC_R_SUCCESS) {
+                       sprintf(problem, "no matching view '%s'", viewtxt);
                        goto fail1;
+               }
 
                result = dns_zt_find(view->zonetable, dns_fixedname_name(&name),
                                     0, NULL, zonep);
-               dns_view_detach(&view);
+               if (result != ISC_R_SUCCESS) {
+                       sprintf(problem, "no matching zone '%s' in view '%s'",
+                               zonetxt, viewtxt);
+                       goto fail1;
+               }
        }
 
        /* Partial match? */
@@ -6257,6 +6270,14 @@ zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep,
        if (result == DNS_R_PARTIALMATCH)
                result = ISC_R_NOTFOUND;
  fail1:
+       if (result != ISC_R_SUCCESS) {
+               putstr(text, problem);
+               isc_buffer_putuint8(text, 0);
+       }
+
+       if (view != NULL)
+               dns_view_detach(&view);
+
        return (result);
 }
 
@@ -6264,12 +6285,14 @@ zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep,
  * Act on a "retransfer" command from the command channel.
  */
 isc_result_t
-ns_server_retransfercommand(ns_server_t *server, char *args) {
+ns_server_retransfercommand(ns_server_t *server, char *args,
+                           isc_buffer_t *text)
+{
        isc_result_t result;
        dns_zone_t *zone = NULL;
        dns_zonetype_t type;
 
-       result = zone_from_args(server, args, &zone, NULL);
+       result = zone_from_args(server, args, &zone, NULL, text);
        if (result != ISC_R_SUCCESS)
                return (result);
        if (zone == NULL)
@@ -6293,7 +6316,7 @@ ns_server_reloadcommand(ns_server_t *server, char *args, isc_buffer_t *text) {
        dns_zonetype_t type;
        const char *msg = NULL;
 
-       result = zone_from_args(server, args, &zone, NULL);
+       result = zone_from_args(server, args, &zone, NULL, text);
        if (result != ISC_R_SUCCESS)
                return (result);
        if (zone == NULL) {
@@ -6353,7 +6376,7 @@ ns_server_notifycommand(ns_server_t *server, char *args, isc_buffer_t *text) {
        dns_zone_t *zone = NULL;
        const unsigned char msg[] = "zone notify queued";
 
-       result = zone_from_args(server, args, &zone, NULL);
+       result = zone_from_args(server, args, &zone, NULL, text);
        if (result != ISC_R_SUCCESS)
                return (result);
        if (zone == NULL)
@@ -6378,7 +6401,7 @@ ns_server_refreshcommand(ns_server_t *server, char *args, isc_buffer_t *text) {
        const unsigned char msg2[] = "not a slave or stub zone";
        dns_zonetype_t type;
 
-       result = zone_from_args(server, args, &zone, NULL);
+       result = zone_from_args(server, args, &zone, NULL, text);
        if (result != ISC_R_SUCCESS)
                return (result);
        if (zone == NULL)
@@ -7469,7 +7492,7 @@ ns_server_tsiglist(ns_server_t *server, isc_buffer_t *text) {
  * Act on a "sign" or "loadkeys" command from the command channel.
  */
 isc_result_t
-ns_server_rekey(ns_server_t *server, char *args) {
+ns_server_rekey(ns_server_t *server, char *args, isc_buffer_t *text) {
        isc_result_t result;
        dns_zone_t *zone = NULL;
        dns_zonetype_t type;
@@ -7479,7 +7502,7 @@ ns_server_rekey(ns_server_t *server, char *args) {
        if (strncasecmp(args, NS_COMMAND_SIGN, strlen(NS_COMMAND_SIGN)) == 0)
            fullsign = ISC_TRUE;
 
-       result = zone_from_args(server, args, &zone, NULL);
+       result = zone_from_args(server, args, &zone, NULL, text);
        if (result != ISC_R_SUCCESS)
                return (result);
        if (zone == NULL)
@@ -7523,7 +7546,7 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze, char *args,
        isc_boolean_t frozen;
        const char *msg = NULL;
 
-       result = zone_from_args(server, args, &zone, NULL);
+       result = zone_from_args(server, args, &zone, NULL, text);
        if (result != ISC_R_SUCCESS)
                return (result);
        if (zone == NULL) {
@@ -7863,7 +7886,7 @@ ns_server_add_zone(ns_server_t *server, char *args) {
  * Act on a "delzone" command from the command channel.
  */
 isc_result_t
-ns_server_del_zone(ns_server_t *server, char *args) {
+ns_server_del_zone(ns_server_t *server, char *args, isc_buffer_t *text) {
        isc_result_t result;
        dns_zone_t *zone = NULL;
        dns_view_t *view = NULL;
@@ -7877,7 +7900,7 @@ ns_server_del_zone(ns_server_t *server, char *args) {
        isc_boolean_t inheader = ISC_TRUE;
 
        /* Parse parameters */
-       CHECK(zone_from_args(server, args, &zone, &zonename));
+       CHECK(zone_from_args(server, args, &zone, &zonename, text));
 
        if (zone == NULL) {
                result = ISC_R_UNEXPECTEDEND;
@@ -8060,3 +8083,17 @@ newzone_cfgctx_destroy(void **cfgp) {
        isc_mem_putanddetach(&cfg->mctx, cfg, sizeof(*cfg));
        *cfgp = NULL;
 }
+
+static isc_result_t
+putstr(isc_buffer_t *b, const char *str) {
+       size_t l = strlen(str);
+
+       /*
+        * Use >= to leave space for NUL termination.
+        */
+       if (l >= isc_buffer_availablelength(b))
+               return (ISC_R_NOSPACE);
+
+       isc_buffer_putmem(b, (const unsigned char *)str, l);
+       return (ISC_R_SUCCESS);
+}