pullup:

 475.   [bug]           query_getzonedb() sometimes returned a non-null version
                        on failure.  This caused assertion failures when
                        generating query responses where names subject to
                        additional section processing pointed to a zone
                        to which access had been denied by means of the
                        allow-query option. [RT #336]

diff --git a/CHANGES b/CHANGES
index 4ee3a1d003454d0201dce4029d3d0f4ecff327e1..4b487f748836e305ec45a802d34987699ed1978a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+ 475.  [bug]           query_getzonedb() sometimes returned a non-null version
+                       on failure.  This caused assertion failures when
+                       generating query responses where names subject to
+                       additional section processing pointed to a zone
+                       to which access had been denied by means of the
+                       allow-query option. [RT #336]
 
  474.  [bug]           The mnemonic of the CHAOS class is CH according to
                        RFC1035, but it was printed and read only as CHAOS.

diff --git a/bin/named/query.c b/bin/named/query.c
index 8606bef8e18afcbcd3b44904fe406cb88774c1d7..56c730fe4c8b519fd4f640d0bb7db92b04086199 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: query.c,v 1.109.2.11 2000/08/22 01:45:09 bwelling Exp $ */
+/* $Id: query.c,v 1.109.2.12 2000/09/19 22:52:48 bwelling Exp $ */
 
 #include <config.h>
 
@@ -490,7 +490,6 @@ query_getzonedb(ns_client_t *client, dns_name_t *name, unsigned int options,
                result = DNS_R_SERVFAIL;
                goto fail;
        }
-       *versionp = dbversion->version;
        if (new_zone) {
                check_acl = ISC_TRUE;
        } else if (!dbversion->queryok) {
@@ -559,6 +558,7 @@ query_getzonedb(ns_client_t *client, dns_name_t *name, unsigned int options,
        /* Transfer ownership. */
        *zonep = zone;
        *dbp = db;
+       *versionp = dbversion->version;
 
        return (ISC_R_SUCCESS);