Merged revisions 284777 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r284777 | bbryant | 2010-09-02 16:25:03 -0400 (Thu, 02 Sep 2010) | 7 lines

  Fixes a bug in manager.c where the default configuration values weren't reset when the manager configuration was reloaded.

  (closes issue #17917)
  Reported by: lmadsen

  Review: https://reviewboard.asterisk.org/r/883/
........

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

diff --git a/main/manager.c b/main/manager.c
index d13672653be8cb25934554a23e1d55cf7133cc9b..17b4dc37c084d38dfd62734169c4e6b16519b5a1 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -120,11 +120,19 @@ struct eventqent {
 
 static AST_RWLIST_HEAD_STATIC(all_events, eventqent);
 
-static int displayconnects = 1;
+static const int DEFAULT_ENABLED                       = 0;    /*!< Default setting for manager to be enabled */
+static const int DEFAULT_WEBENABLED                    = 0;    /*!< Default setting for the web interface to be enabled */
+static const int DEFAULT_BLOCKSOCKETS          = 0;    /*!< Default setting for block-sockets */
+static const int DEFAULT_DISPLAYCONNECTS       = 1;    /*!< Default setting for displaying manager connections */
+static const int DEFAULT_TIMESTAMPEVENTS       = 0;    /*!< Default setting for timestampevents */     
+static const int DEFAULT_HTTPTIMEOUT           = 60;   /*!< Default manager http timeout */
+static const int DEFAULT_BROKENEVENTSACTION    = 0;    /*!< Default setting for brokeneventsaction */
+
+static int displayconnects;
 static int allowmultiplelogin = 1;
 static int timestampevents;
-static int httptimeout = 60;
-static int broken_events_action = 0;
+static int httptimeout;
+static int broken_events_action;
 static int manager_enabled = 0;
 static int webmanager_enabled = 0;
 
@@ -4116,16 +4124,14 @@ static int __init_manager(int reload)
        struct ast_config *ucfg = NULL, *cfg = NULL;
        const char *val;
        char *cat = NULL;
-       int newhttptimeout = 60;
+       int newhttptimeout = DEFAULT_HTTPTIMEOUT;
        int have_sslbindaddr = 0;
        struct hostent *hp;
        struct ast_hostent ahp;
        struct ast_manager_user *user = NULL;
        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);
@@ -4170,8 +4176,14 @@ static int __init_manager(int reload)
        if ((cfg = ast_config_load2("manager.conf", "manager", config_flags)) == CONFIG_STATUS_FILEUNCHANGED)
                return 0;
 
-       displayconnects = 1;
-       broken_events_action = 0;
+       manager_enabled = DEFAULT_ENABLED;
+       webmanager_enabled = DEFAULT_WEBENABLED;
+       displayconnects = DEFAULT_DISPLAYCONNECTS;
+       broken_events_action = DEFAULT_BROKENEVENTSACTION;
+       block_sockets = DEFAULT_BLOCKSOCKETS;
+       timestampevents = DEFAULT_TIMESTAMPEVENTS;
+       httptimeout = DEFAULT_HTTPTIMEOUT;
+
        if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) {
                ast_log(LOG_NOTICE, "Unable to open AMI configuration manager.conf, or configuration is invalid. Asterisk management interface (AMI) disabled.\n");
                return 0;