Merged revisions 279273 via svnmerge from

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

........
  r279273 | pabelanger | 2010-07-24 13:36:42 -0400 (Sat, 24 Jul 2010) | 6 lines

  Default sin_family to AF_INET for TCP / TLS Bindaddress.

  Otherwise, 'manager show settings' will generate errors
  if manager is not enabled.
........

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

diff --git a/main/manager.c b/main/manager.c
index 9d31eebdabb944a7187b6ef04be4ed64059be465..e9007d80441b998b5c4e1c7544c316480cb9d678 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -6271,17 +6271,15 @@ static int __init_manager(int reload)
                }
        }
 
-       if (manager_enabled) {
-               ami_desc_local_address_tmp.sin_family = AF_INET;
-       }
+       ami_desc_local_address_tmp.sin_family = AF_INET;
+       amis_desc_local_address_tmp.sin_family = AF_INET;
+
        /* if the amis address has not been set, default is the same as non secure ami */
        if (!amis_desc_local_address_tmp.sin_addr.s_addr) {
                amis_desc_local_address_tmp.sin_addr =
                    ami_desc_local_address_tmp.sin_addr;
        }
-       if (ami_tls_cfg.enabled) {
-               amis_desc_local_address_tmp.sin_family = AF_INET;
-       }
+
        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);