3249. [bug] Update log message when saving slave zones files for

                        analysis after load failures. [RT #27087]

3247.   [bug]           'raw' format zones failed to preserve load order
                        breaking 'fixed' sort order. [RT #27087]

diff --git a/CHANGES b/CHANGES
index 943900087c9fae4c2544dfadabb7e5ef6c0db1de..122da49c68fec5801304b84a3679788617303bab 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+3249.  [bug]           Update log message when saving slave zones files for
+                       analysis after load failures. [RT #27087]
+
+3247.  [bug]           'raw' format zones failed to preserve load order
+                       breaking 'fixed' sort order. [RT #27087]
+
 3243.  [port]          netbsd,bsdi: the thread defaults were not being
                        properly set.
 

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 43069873af736031463fe430009328329ed9b7da..8369bcc4fb3b0941d84d34c71c07d3ddf9a0757a 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.147.50.5 2011/03/12 04:57:24 tbox Exp $ */
+/* $Id: zoneconf.c,v 1.147.50.6 2011/12/20 00:16:21 marka Exp $ */
 
 /*% */
 
@@ -893,8 +893,11 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
                                                         &count));
                        result = dns_zone_setmasterswithkeys(zone, addrs,
                                                             keynames, count);
-                       ns_config_putipandkeylist(mctx, &addrs, &keynames,
-                                                 count);
+                       if (count != 0)
+                               ns_config_putipandkeylist(mctx, &addrs,
+                                                         &keynames, count);
+                       else
+                               INSIST(addrs == NULL && keynames == NULL);
                } else
                        result = dns_zone_setmasters(zone, NULL, 0);
                RETERR(result);

diff --git a/bin/tests/system/notify/ns2/named.conf b/bin/tests/system/notify/ns2/named.conf
index 92b9d1c0931cf97187fe82f4805dd8ff482cff91..d7a3ad88ce2009a4653fe73fc41a823100741989 100644 (file)
--- a/bin/tests/system/notify/ns2/named.conf
+++ b/bin/tests/system/notify/ns2/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.20.332.2 2011/10/17 23:45:22 tbox Exp $ */
+/* $Id: named.conf,v 1.20.332.3 2011/12/20 00:16:22 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -39,4 +39,6 @@ zone "." {
 zone "example" {
        type master;
        file "example.db";
+       // Check that named can handle a empty also-notify.
+       also-notify { /* empty */ };
 };

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index e9febf464237b966c415e8cba5531bacdbe83b49..8c31386fef635df9c21e49ac984dc0e8120b537c 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.94.50.11 2011/09/07 19:11:53 each Exp $ */
+/* $Id: masterdump.c,v 1.94.50.12 2011/12/20 00:16:20 marka Exp $ */
 
 /*! \file */
 
@@ -865,6 +865,7 @@ dump_rdataset_raw(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset,
        REQUIRE(buffer->length > 0);
        REQUIRE(DNS_RDATASET_VALID(rdataset));
 
+       rdataset->attributes |= DNS_RDATASETATTR_LOADORDER;
  restart:
        totallen = 0;
        result = dns_rdataset_first(rdataset);

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 6a98797f8ef8ce0d210ac618f5c9dbb7769fbd66..50a26730f220bb379c8a742ec01f432c268de06e 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.483.36.42 2011/11/04 05:52:57 each Exp $ */
+/* $Id: zone.c,v 1.483.36.43 2011/12/20 00:16:21 marka Exp $ */
 
 /*! \file */
 
@@ -11141,8 +11141,9 @@ zone_saveunique(dns_zone_t *zone, const char *path, const char *templat) {
        if (result != ISC_R_SUCCESS)
                goto cleanup;
 
-       dns_zone_log(zone, ISC_LOG_WARNING, "saved '%s' as '%s'",
-                    path, buf);
+       dns_zone_log(zone, ISC_LOG_WARNING, "unable to load from '%'; "
+                    "renaming file to '%s' for failure analysis and "
+                    "retransferring.", path, buf);
 
  cleanup:
        isc_mem_put(zone->mctx, buf, buflen);