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

rename zone to mayberaw

Browse Source 
(cherry picked from commit 3ea9861e7a)
This commit is contained in:
Mark Andrews
2018-08-02 14:27:41 +10:00
parent b73a78d3ad
commit 94ca5cdfd6
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/named/server.c
+18 -18
View File
@@ -11220,7 +11220,7 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze,
isc_lex_t *lex, isc_buffer_t **text)
{
isc_result_t result, tresult;
dns_zone_t *zone = NULL, *raw = NULL;
dns_zone_t *mayberaw = NULL, *raw = NULL;
dns_zonetype_t type;
char classstr[DNS_RDATACLASS_FORMATSIZE];
char zonename[DNS_NAME_FORMATSIZE];
@@ -11229,11 +11229,11 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze,
isc_boolean_t frozen;
const char *msg = NULL;
result = zone_from_args(server, lex, NULL, &zone, NULL,
result = zone_from_args(server, lex, NULL, &mayberaw, NULL,
text, ISC_TRUE);
if (result != ISC_R_SUCCESS)
return (result);
if (zone == NULL) {
if (mayberaw == NULL) {
result = isc_task_beginexclusive(server->task);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
tresult = ISC_R_SUCCESS;
@@ -11253,26 +11253,26 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze,
isc_result_totext(tresult));
return (tresult);
}
dns_zone_getraw(zone, &raw);
dns_zone_getraw(mayberaw, &raw);
if (raw != NULL) {
dns_zone_detach(&zone);
dns_zone_attach(raw, &zone);
dns_zone_detach(&mayberaw);
dns_zone_attach(raw, &mayberaw);
dns_zone_detach(&raw);
}
type = dns_zone_gettype(zone);
type = dns_zone_gettype(mayberaw);
if (type != dns_zone_master) {
dns_zone_detach(&zone);
dns_zone_detach(&mayberaw);
return (DNS_R_NOTMASTER);
}
if (freeze && !dns_zone_isdynamic(zone, ISC_TRUE)) {
dns_zone_detach(&zone);
if (freeze && !dns_zone_isdynamic(mayberaw, ISC_TRUE)) {
dns_zone_detach(&mayberaw);
return (DNS_R_NOTDYNAMIC);
}
result = isc_task_beginexclusive(server->task);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
frozen = dns_zone_getupdatedisabled(zone);
frozen = dns_zone_getupdatedisabled(mayberaw);
if (freeze) {
if (frozen) {
msg = "WARNING: The zone was already frozen.\n"
@@ -11281,16 +11281,16 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze,
result = DNS_R_FROZEN;
}
if (result == ISC_R_SUCCESS) {
result = dns_zone_flush(zone);
result = dns_zone_flush(mayberaw);
if (result != ISC_R_SUCCESS)
msg = "Flushing the zone updates to "
"disk failed.";
}
if (result == ISC_R_SUCCESS)
dns_zone_setupdatedisabled(zone, freeze);
dns_zone_setupdatedisabled(mayberaw, freeze);
} else {
if (frozen) {
result = dns_zone_loadandthaw(zone);
result = dns_zone_loadandthaw(mayberaw);
switch (result) {
case ISC_R_SUCCESS:
case DNS_R_UPTODATE:
@@ -11313,7 +11313,7 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze,
(void) putnull(text);
}
view = dns_zone_getview(zone);
view = dns_zone_getview(mayberaw);
if (strcmp(view->name, "_default") == 0 ||
strcmp(view->name, "_bind") == 0)
{
@@ -11323,9 +11323,9 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze,
vname = view->name;
sep = " ";
}
dns_rdataclass_format(dns_zone_getclass(zone), classstr,
dns_rdataclass_format(dns_zone_getclass(mayberaw), classstr,
sizeof(classstr));
dns_name_format(dns_zone_getorigin(zone),
dns_name_format(dns_zone_getorigin(mayberaw),
zonename, sizeof(zonename));
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_SERVER, ISC_LOG_INFO,
@@ -11333,7 +11333,7 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze,
freeze ? "freezing" : "thawing",
zonename, classstr, sep, vname,
isc_result_totext(result));
dns_zone_detach(&zone);
dns_zone_detach(&mayberaw);
return (result);
}