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

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

diff --git a/CHANGES b/CHANGES
index 4de1a59cf85c420355194022542ea5196c407b49..6c1f414b020fc296eff0fc18481a1fc87732fed9 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]
+
 2815.  [bug]           Exclusively lock the task when freezing a zone.
                        [RT #19838]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index a9acd24380440bab720f0a7bd4ed31ce77348b7c..eb090b7bce74ae9028c3301f8e4409e76149da5c 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.495.10.30 2009/12/23 23:34:45 each Exp $ */
+/* $Id: server.c,v 1.495.10.31 2009/12/24 00:17:06 each Exp $ */
 
 /*! \file */
 
@@ -4335,6 +4335,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);
 }