2818. [cleanup] rndc could return an incorrect error code

			when a zone was not found. [RT #20767]

diff --git a/CHANGES b/CHANGES
index 259b274ffb635c13c8f41a364d79b58464a391db..2b8a34c1be1db29937098c0d71fedcd04887118f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2818.  [cleanup]       rndc could return an incorrect error code 
+                       when a zone was not found. [RT #20767]
+
 2817.  [cleanup]       Removed unnecessary isc_tasc_endexclusive() calls.
                        [RT #20768]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 6889f5239a4918fd2b28b8c3c20d9a3848ea18c1..4da1d0b071935dffd1bb35de97cd41f9d4fc0c68 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.558 2009/12/23 23:59:42 each Exp $ */
+/* $Id: server.c,v 1.559 2009/12/24 00:14:20 each Exp $ */
 
 /*! \file */
 
@@ -5132,6 +5132,8 @@ zone_from_args(ns_server_t *server, char *args, dns_zone_t **zonep) {
        /* Partial match? */
        if (result != ISC_R_SUCCESS && *zonep != NULL)
                dns_zone_detach(zonep);
+       if (result == DNS_R_PARTIALMATCH)
+               result = ISC_R_NOTFOUND;
  fail1:
        return (result);
 }