ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

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

Browse Source 
analysis after load failures. [RT #27087]

3247.   [bug]           'raw' format zones failed to preserve load order
                        breaking 'fixed' sort order. [RT #27087]
This commit is contained in:
Mark Andrews
2011-12-20 00:16:22 +00:00
parent c36ac535d8
commit 6b3e4a7f46
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@@ -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.

9
bin/named/zoneconf.c
View File

@@ -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);

4
bin/tests/system/notify/ns2/named.conf
View File

@@ -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 */ };
};

3
lib/dns/masterdump.c
View File

@@ -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);

7
lib/dns/zone.c
View File

@@ -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);