[asterisk-commits] mmichelson: branch 1.6.0 r110832 - in /branches/1.6.0: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Mar 25 19:03:12 2008
New Revision: 110832

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110832
Log:
Merged revisions 110831 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r110831 | mmichelson | 2008-03-25 19:02:31 -0500 (Tue, 25 Mar 2008) | 6 lines

This ensures that the manager interface is not enabled by default. Prior to this
change, it was possible to start Asterisk with the manager interface enabled, then
either comment out the enabled option or make manager.conf unopenable and the manager
interface would still be enabled.


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/manager.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=110832&r1=110831&r2=110832
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Tue Mar 25 19:03:12 2008
@@ -3645,6 +3645,8 @@
 	struct ast_variable *var;
 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
 
+	manager_enabled = 0;
+
 	if (!registered) {
 		/* Register default actions */
 		ast_manager_register2("Ping", 0, action_ping, "Keepalive command", mandescr_ping);