Merged revisions 293611 via svnmerge from

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

........
  r293611 | pabelanger | 2010-11-02 16:45:09 -0400 (Tue, 02 Nov 2010) | 2 lines

  If manager and tls are disabled, do not display TCP/TLS Bindaddress.
........

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

diff --git a/main/manager.c b/main/manager.c
index 4f8a151b120fdf89515c15654a3b8a3adeb54159..961ed5786ef37342415bace55c9d9f8d28c08732 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -6103,10 +6103,10 @@ static char *handle_manager_show_settings(struct ast_cli_entry *e, int cmd, stru
        ast_cli(a->fd, "----------------\n");
        ast_cli(a->fd, FORMAT, "Manager (AMI):", AST_CLI_YESNO(manager_enabled));
        ast_cli(a->fd, FORMAT, "Web Manager (AMI/HTTP):", AST_CLI_YESNO(webmanager_enabled));
-       ast_cli(a->fd, FORMAT, "TCP Bindaddress:", ast_sockaddr_stringify(&ami_desc.local_address));
+       ast_cli(a->fd, FORMAT, "TCP Bindaddress:", manager_enabled != 0 ? ast_sockaddr_stringify(&ami_desc.local_address) : "Disabled");
        ast_cli(a->fd, FORMAT2, "HTTP Timeout (minutes):", httptimeout);
        ast_cli(a->fd, FORMAT, "TLS Enable:", AST_CLI_YESNO(ami_tls_cfg.enabled));
-       ast_cli(a->fd, FORMAT, "TLS Bindaddress:", ast_sockaddr_stringify(&amis_desc.local_address));
+       ast_cli(a->fd, FORMAT, "TLS Bindaddress:", ami_tls_cfg.enabled != 0 ? ast_sockaddr_stringify(&amis_desc.local_address) : "Disabled");
        ast_cli(a->fd, FORMAT, "TLS Certfile:", ami_tls_cfg.certfile);
        ast_cli(a->fd, FORMAT, "TLS Privatekey:", ami_tls_cfg.pvtfile);
        ast_cli(a->fd, FORMAT, "TLS Cipher:", ami_tls_cfg.cipher);