From 94f18483e320a28e8d86064059b875378b24b16b Mon Sep 17 00:00:00 2001 From: mmichelson Date: Wed, 26 Mar 2008 00:03:12 +0000 Subject: 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. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@110832 f38db490-d61c-443f-a65b-d21fe96a405b --- main/manager.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'main/manager.c') diff --git a/main/manager.c b/main/manager.c index b4e6cb0be..4ef298ddb 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3645,6 +3645,8 @@ static int __init_manager(int reload) 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); -- cgit v1.2.3