[svn-commits] pabelanger: branch 1.8 r279273 - /branches/1.8/main/manager.c

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Sat Jul 24 12:36:42 2010
New Revision: 279273

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279273
Log:
Default sin_family to AF_INET for TCP / TLS Bindaddress. 

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


Modified:
    branches/1.8/main/manager.c

Modified: branches/1.8/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/manager.c?view=diff&rev=279273&r1=279272&r2=279273
==============================================================================
--- branches/1.8/main/manager.c (original)
+++ branches/1.8/main/manager.c Sat Jul 24 12:36:42 2010
@@ -6271,17 +6271,15 @@
 		}
 	}
 
-	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);