From: Evan Hunt <each@isc.org>
Date: Wed, 20 Jan 2016 17:53:26 +0000 (-0800)
Subject: [master] fixed rndc stop -p
X-Git-Tag: v9.11.0a1~189
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6bd794171f2ba0ee93b99ccbf80378959f4e965b;p=thirdparty%2Fbind9.git

[master] fixed rndc stop -p

4294.	[bug]		Fixed a regression in which "rndc stop -p" failed
			to print the PID. [RT #41513]
---

diff --git a/CHANGES b/CHANGES
index 64ac3395e22..806a118684c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 
diff --git a/bin/named/control.c b/bin/named/control.c
index e4347161ebb..57dc8445ed3 100644
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -191,7 +191,7 @@ ns_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly,
 #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)) {
@@ -208,7 +208,7 @@ ns_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly,
 			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)) {