mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

2031. [bug] Emit a error message when "rndc refresh" is called on

Browse Source 
a non slave/stub zone. [RT # 16073]
This commit is contained in:
Mark Andrews
2006-05-24 04:23:15 +00:00
parent 37e75a624c
commit c79e85f7d7
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
2031. [bug] Emit a error message when "rndc refresh" is called on
a non slave/stub zone. [RT # 16073]
2030. [bug] We were being overly conservative when disabling 2030. [bug] We were being overly conservative when disabling
openssl engine support. [RT #16030] openssl engine support. [RT #16030]

19
bin/named/server.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: server.c,v 1.464 2006/05/18 02:00:11 marka Exp $ */ /* $Id: server.c,v 1.465 2006/05/24 04:23:15 marka Exp $ */
/*! \file */ /*! \file */
@@ -4021,7 +4021,9 @@ isc_result_t
ns_server_refreshcommand(ns_server_t *server, char *args, isc_buffer_t *text) { ns_server_refreshcommand(ns_server_t *server, char *args, isc_buffer_t *text) {
isc_result_t result; isc_result_t result;
dns_zone_t *zone = NULL; dns_zone_t *zone = NULL;
const unsigned char msg[] = "zone refresh queued"; const unsigned char msg1[] = "zone refresh queued";
const unsigned char msg2[] = "not a slave or stub zone";
dns_zonetype_t type;
result = zone_from_args(server, args, &zone); result = zone_from_args(server, args, &zone);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
@@ -4029,14 +4031,21 @@ ns_server_refreshcommand(ns_server_t *server, char *args, isc_buffer_t *text) {
if (zone == NULL) if (zone == NULL)
return (ISC_R_UNEXPECTEDEND); return (ISC_R_UNEXPECTEDEND);
type = dns_zone_gettype(zone);
if (type == dns_zone_slave || type == dns_zone_stub) {
dns_zone_refresh(zone); dns_zone_refresh(zone);
dns_zone_detach(&zone); dns_zone_detach(&zone);
if (sizeof(msg) <= isc_buffer_availablelength(text)) if (sizeof(msg1) <= isc_buffer_availablelength(text))
isc_buffer_putmem(text, msg, sizeof(msg)); isc_buffer_putmem(text, msg1, sizeof(msg1));
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }
dns_zone_detach(&zone);
if (sizeof(msg2) <= isc_buffer_availablelength(text))
isc_buffer_putmem(text, msg2, sizeof(msg2));
return (ISC_R_FAILURE);
}
isc_result_t isc_result_t
ns_server_togglequerylog(ns_server_t *server) { ns_server_togglequerylog(ns_server_t *server) {
server->log_queries = server->log_queries ? ISC_FALSE : ISC_TRUE; server->log_queries = server->log_queries ? ISC_FALSE : ISC_TRUE;