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

This commit is contained in:
Mark Andrews
2000-06-05 03:44:17 +00:00
parent 69b691c962
commit ac3b769801
4 changed files with 16 additions and 6 deletions

View File

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

View File

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