[v9_10] fixed rndc stop -p

4294.	[bug]		Fixed a regression in which "rndc stop -p" failed
			to print the PID. [RT #41513]
This commit is contained in:
Evan Hunt 2016-01-20 09:56:51 -08:00
parent 84fbd9a186
commit 19bee30eb0
2 changed files with 5 additions and 2 deletions

View file

@ -1,3 +1,6 @@
4294. [bug] Fixed a regression in which "rndc stop -p" failed
to print the PID. [RT #41513]
4293. [bug] Address memory leak on priming query creation failure.
[RT #41512]

View file

@ -167,7 +167,7 @@ ns_control_docommand(isccc_sexpr_t *message, isc_buffer_t *text) {
#endif
/* Do not flush master files */
ns_server_flushonshutdown(ns_g_server, ISC_FALSE);
ns_os_shutdownmsg(command, text);
ns_os_shutdownmsg(cmdline, text);
isc_app_shutdown();
result = ISC_R_SUCCESS;
} else if (command_compare(command, NS_COMMAND_STOP)) {
@ -184,7 +184,7 @@ ns_control_docommand(isccc_sexpr_t *message, isc_buffer_t *text) {
ns_smf_want_disable = 1;
#endif
ns_server_flushonshutdown(ns_g_server, ISC_TRUE);
ns_os_shutdownmsg(command, text);
ns_os_shutdownmsg(cmdline, text);
isc_app_shutdown();
result = ISC_R_SUCCESS;
} else if (command_compare(command, NS_COMMAND_DUMPSTATS)) {