2418. [bug] AXFR request on a DLZ could trigger a REQUIRE failure

			[RT #18430]

diff --git a/CHANGES b/CHANGES
index 568a42e0ed03a10092975312df5c3e7fb7bb1c5c..cc950daf1c687bbf7f7522ce3cf3faa912d06464 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2418.  [bug]           AXFR request on a DLZ could trigger a REQUIRE failure
+                       [RT #18430]
+
 2417.  [bug]           Connecting UDP sockets for outgoing queries could
                        unexpectedly fail with an 'address already in use'
                        error. [RT #18411]

diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index ba6ae3f22782f3c42590b88ce16564bc585ac24b..befd09ef8a32bf6fba3eac0315bfa41e64f50d89 100644 (file)
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.128 2008/04/03 06:09:04 tbox Exp $ */
+/* $Id: xfrout.c,v 1.129 2008/08/15 19:36:49 jinmei Exp $ */
 
 #include <config.h>
 
@@ -1333,7 +1333,8 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id,
        xfr->zone = NULL;
        xfr->db = NULL;
        xfr->ver = NULL;
-       dns_zone_attach(zone, &xfr->zone);
+       if (zone != NULL)       /* zone will be NULL if it's DLZ */
+               dns_zone_attach(zone, &xfr->zone);
        dns_db_attach(db, &xfr->db);
        dns_db_attachversion(db, ver, &xfr->ver);
        xfr->end_of_stream = ISC_FALSE;