cleanup

(cherry picked from commit 99c3e8e09c50a6a45279112916b20bc0cb11e5ec)

diff --git a/bin/named/server.c b/bin/named/server.c
index 02cb1880d31b018c3f1a1eb9536b21207f1c349e..bf9c62913a207b8c6c851b23cf825fbf1f90f1f1 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -6190,9 +6190,9 @@ zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep,
        const char *zonetxt;
        char *classtxt;
        const char *viewtxt = NULL;
-       dns_fixedname_t name;
+       dns_fixedname_t fname;
+       dns_name_t *name;
        isc_result_t result;
-       isc_buffer_t buf;
        dns_view_t *view = NULL;
        dns_rdataclass_t rdclass;
        char problem[DNS_NAME_FORMATSIZE + 500] = "";
@@ -6221,27 +6221,20 @@ zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep,
                viewtxt = next_token(&input, " \t");
        }
 
-       isc_buffer_constinit(&buf, zonetxt, strlen(zonetxt));
-       isc_buffer_add(&buf, strlen(zonetxt));
-       dns_fixedname_init(&name);
-       result = dns_name_fromtext(dns_fixedname_name(&name),
-                                  &buf, dns_rootname, 0, NULL);
-       if (result != ISC_R_SUCCESS)
-               goto fail1;
+       dns_fixedname_init(&fname);
+       name = dns_fixedname_name(&fname);
+       CHECK(dns_name_fromstring(name, zonetxt, 0, NULL));
 
        if (classtxt != NULL) {
                isc_textregion_t r;
                r.base = classtxt;
                r.length = strlen(classtxt);
-               result = dns_rdataclass_fromtext(&rdclass, &r);
-               if (result != ISC_R_SUCCESS)
-                       goto fail1;
+               CHECK(dns_rdataclass_fromtext(&rdclass, &r));
        } else
                rdclass = dns_rdataclass_in;
 
        if (viewtxt == NULL) {
-               result = dns_viewlist_findzone(&server->viewlist,
-                                              dns_fixedname_name(&name),
+               result = dns_viewlist_findzone(&server->viewlist, name,
                                               ISC_TF(classtxt == NULL),
                                               rdclass, zonep);
                if (result == ISC_R_NOTFOUND)
@@ -6254,17 +6247,14 @@ zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep,
                if (result != ISC_R_SUCCESS) {
                        snprintf(problem, sizeof(problem),
                                 "no matching view '%s'", viewtxt);
-                       goto fail1;
+                       goto report;
                }
 
-               result = dns_zt_find(view->zonetable, dns_fixedname_name(&name),
-                                    0, NULL, zonep);
-               if (result != ISC_R_SUCCESS) {
+               result = dns_zt_find(view->zonetable, name, 0, NULL, zonep);
+               if (result != ISC_R_SUCCESS)
                        snprintf(problem, sizeof(problem),
                                 "no matching zone '%s' in view '%s'",
                                 zonetxt, viewtxt);
-                       goto fail1;
-               }
        }
 
        /* Partial match? */
@@ -6272,7 +6262,7 @@ zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep,
                dns_zone_detach(zonep);
        if (result == DNS_R_PARTIALMATCH)
                result = ISC_R_NOTFOUND;
- fail1:
+ report:
        if (result != ISC_R_SUCCESS) {
                isc_result_t tresult;
 
@@ -6282,6 +6272,7 @@ zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep,
                        isc_buffer_putuint8(text, 0);
        }
 
+ cleanup:
        if (view != NULL)
                dns_view_detach(&view);