aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-26 00:02:31 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-26 00:02:31 +0000
commit97619eccb1ddd6771755f632ace40f4119743c60 (patch)
treef3dbe1b0c20261fe322e543cd52043835c3aaa3b
parent624520ee1c9d1c37c6a910d425cd9c5cc352603d (diff)
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/trunk@110831 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/manager.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/manager.c b/main/manager.c
index 03ea2a178..e54238c23 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -3714,6 +3714,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);