Commit ac3b7698 authored by Mark Andrews's avatar Mark Andrews
Browse files

232. [bug] Allow slave zones to not have a file.

parent 69b691c9
232. [bug] Allow slave zones to not have a file.
231. [func] Support new 'port' clause in config file options
section. Causes 'listen-on', 'masters' and
'also-notify' statements to use its value instead of
......
......@@ -135,8 +135,12 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
/* XXX needs to be an zone option */
RETERR(dns_zone_setdbtype(zone, "rbt"));
RETERR(dns_c_zone_getfile(czone, &filename));
RETERR(dns_zone_setdatabase(zone, filename));
result = dns_c_zone_getfile(czone, &filename);
if (result == ISC_R_SUCCESS)
RETERR(dns_zone_setdatabase(zone, filename));
else if (czone->ztype != dns_c_zone_slave &&
czone->ztype != dns_c_zone_stub)
return (result);
#ifdef notyet
result = dns_c_zone_getchecknames(czone, &severity);
......
......@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: zone.c,v 1.140 2000/06/02 17:31:29 gson Exp $ */
/* $Id: zone.c,v 1.141 2000/06/05 03:44:17 marka Exp $ */
#include <config.h>
......@@ -3135,7 +3135,7 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) {
if (result != ISC_R_SUCCESS)
goto fail;
} else {
if (dump) {
if (dump && zone->dbname != NULL) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
DNS_LOGMODULE_ZONE, ISC_LOG_DEBUG(3),
"dumping new zone version");
......
......@@ -135,8 +135,12 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
/* XXX needs to be an zone option */
RETERR(dns_zone_setdbtype(zone, "rbt"));
RETERR(dns_c_zone_getfile(czone, &filename));
RETERR(dns_zone_setdatabase(zone, filename));
result = dns_c_zone_getfile(czone, &filename);
if (result == ISC_R_SUCCESS)
RETERR(dns_zone_setdatabase(zone, filename));
else if (czone->ztype != dns_c_zone_slave &&
czone->ztype != dns_c_zone_stub)
return (result);
#ifdef notyet
result = dns_c_zone_getchecknames(czone, &severity);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment