Make AMI honor enabled=no

(closes issue #18040)
Reported by: twilson

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

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

diff --git a/main/manager.c b/main/manager.c
index 740dd5fc1143fd019e1d9bfdc0368a3f2cfbe2cd..cf24d354e61da6b17a76f5b74e4f5e0c64fcf3bb 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -6215,6 +6215,8 @@ static int __init_manager(int reload)
 
        /* default values */
        ast_copy_string(global_realm, S_OR(ast_config_AST_SYSTEM_NAME, DEFAULT_REALM), sizeof(global_realm));
+       memset(&ami_desc.local_address, 0, sizeof(struct sockaddr_in));
+       memset(&amis_desc.local_address, 0, sizeof(amis_desc.local_address));
        amis_desc_local_address_tmp.sin_port = htons(5039);
        ami_desc_local_address_tmp.sin_port = htons(DEFAULT_MANAGER_PORT);
 
@@ -6299,8 +6301,10 @@ static int __init_manager(int reload)
                    ami_desc_local_address_tmp.sin_addr;
        }
 
-       ast_sockaddr_from_sin(&ami_desc.local_address, &ami_desc_local_address_tmp);
-       ast_sockaddr_from_sin(&amis_desc.local_address, &amis_desc_local_address_tmp);
+       if (manager_enabled) {
+               ast_sockaddr_from_sin(&ami_desc.local_address, &ami_desc_local_address_tmp);
+               ast_sockaddr_from_sin(&amis_desc.local_address, &amis_desc_local_address_tmp);
+       }
 
        AST_RWLIST_WRLOCK(&users);