mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

2161. [bug] Fix which log messages are emitted for 'rndc flush'.

Browse Source 
[RT #16698]
This commit is contained in:
Mark Andrews
2007-03-13 04:30:17 +00:00
parent 67a00bc40b
commit b5f690e161
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
2161. [bug] Fix which log messages are emitted for 'rndc flush'.
[RT #16698]
2160. [bug] libisc wasn't handling NULL ifa_addr pointers returned 2160. [bug] libisc wasn't handling NULL ifa_addr pointers returned
from getifaddrs(). [RT #16708] from getifaddrs(). [RT #16708]

11
bin/named/server.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: server.c,v 1.478 2007/02/26 02:19:45 marka Exp $ */ /* $Id: server.c,v 1.479 2007/03/13 04:30:17 marka Exp $ */
/*! \file */ /*! \file */
@@ -4816,7 +4816,7 @@ isc_result_t
ns_server_flushcache(ns_server_t *server, char *args) { ns_server_flushcache(ns_server_t *server, char *args) {
char *ptr, *viewname; char *ptr, *viewname;
dns_view_t *view; dns_view_t *view;
isc_boolean_t flushed = ISC_FALSE; isc_boolean_t flushed;
isc_result_t result; isc_result_t result;
/* Skip the command name. */ /* Skip the command name. */
@@ -4829,6 +4829,7 @@ ns_server_flushcache(ns_server_t *server, char *args) {
result = isc_task_beginexclusive(server->task); result = isc_task_beginexclusive(server->task);
RUNTIME_CHECK(result == ISC_R_SUCCESS); RUNTIME_CHECK(result == ISC_R_SUCCESS);
flushed = ISC_TRUE;
for (view = ISC_LIST_HEAD(server->viewlist); for (view = ISC_LIST_HEAD(server->viewlist);
view != NULL; view != NULL;
view = ISC_LIST_NEXT(view, link)) view = ISC_LIST_NEXT(view, link))
@@ -4837,13 +4838,12 @@ ns_server_flushcache(ns_server_t *server, char *args) {
continue; continue;
result = dns_view_flushcache(view); result = dns_view_flushcache(view);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
flushed = ISC_FALSE;
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_SERVER, ISC_LOG_ERROR, NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
"flushing cache in view '%s' failed: %s", "flushing cache in view '%s' failed: %s",
view->name, isc_result_totext(result)); view->name, isc_result_totext(result));
goto out;
} }
flushed = ISC_TRUE;
} }
if (flushed) { if (flushed) {
if (viewname != NULL) if (viewname != NULL)
@@ -4859,7 +4859,6 @@ ns_server_flushcache(ns_server_t *server, char *args) {
} else { } else {
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
} }
out:
isc_task_endexclusive(server->task); isc_task_endexclusive(server->task);
return (result); return (result);
} }
@@ -4868,7 +4867,7 @@ isc_result_t
ns_server_flushname(ns_server_t *server, char *args) { ns_server_flushname(ns_server_t *server, char *args) {
char *ptr, *target, *viewname; char *ptr, *target, *viewname;
dns_view_t *view; dns_view_t *view;
isc_boolean_t flushed = ISC_FALSE; isc_boolean_t flushed;
isc_result_t result; isc_result_t result;
isc_buffer_t b; isc_buffer_t b;
dns_fixedname_t fixed; dns_fixedname_t fixed;