From: Olle Johansson <oej@edvina.net>
Date: Mon, 19 Sep 2011 12:06:48 +0000 (+0000)
Subject: Make sure manager_debug option is reset at reload
X-Git-Tag: 1.8.8.0-rc1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02a28f4afef49c2730ad4617a4e825b581789b4e;p=thirdparty%2Fasterisk.git

Make sure manager_debug option is reset at reload


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@336440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index 8504883b0a..357a85c3aa 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -873,6 +873,7 @@ static const int DEFAULT_HTTPTIMEOUT 		= 60;	/*!< Default manager http timeout *
 static const int DEFAULT_BROKENEVENTSACTION	= 0;	/*!< Default setting for brokeneventsaction */
 static const int DEFAULT_AUTHTIMEOUT		= 30;	/*!< Default setting for authtimeout */
 static const int DEFAULT_AUTHLIMIT		= 50;	/*!< Default setting for authlimit */
+static const int DEFAULT_MANAGERDEBUG		= 0;	/*!< Default setting for manager debug */
 
 static int displayconnects;
 static int allowmultiplelogin = 1;
@@ -881,6 +882,7 @@ static int httptimeout;
 static int broken_events_action;
 static int manager_enabled = 0;
 static int webmanager_enabled = 0;
+static int manager_debug = 0;	/*!< enable some debugging code in the manager */
 static int authtimeout;
 static int authlimit;
 static char *manager_channelvars;
@@ -891,7 +893,6 @@ static char global_realm[MAXHOSTNAMELEN];	/*!< Default realm */
 static int block_sockets;
 static int unauth_sessions = 0;
 
-static int manager_debug;	/*!< enable some debugging code in the manager */
 
 /*! \brief
  * Descriptor for a manager session, either on the AMI socket or over HTTP.
@@ -6293,6 +6294,7 @@ static int __init_manager(int reload)
 
 	manager_enabled = DEFAULT_ENABLED;
 	webmanager_enabled = DEFAULT_WEBENABLED;
+	manager_debug = DEFAULT_MANAGERDEBUG;
 	displayconnects = DEFAULT_DISPLAYCONNECTS;
 	broken_events_action = DEFAULT_BROKENEVENTSACTION;
 	block_sockets = DEFAULT_BLOCKSOCKETS;