[svn-commits] pabelanger: trunk r279274 - in /trunk: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Sat Jul 24 12:54:03 2010
New Revision: 279274

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279274
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Sat Jul 24 12:54:03 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227
+/branches/1.8:1-279056,279113,279227,279273

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=279274&r1=279273&r2=279274
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Sat Jul 24 12:54:03 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);