diff options
| author | Paul Belanger <paul.belanger@polybeacon.com> | 2010-11-02 20:47:37 +0000 |
|---|---|---|
| committer | Paul Belanger <paul.belanger@polybeacon.com> | 2010-11-02 20:47:37 +0000 |
| commit | 0aacbecacc6c68c141f071a79d26e7f700ec82b4 (patch) | |
| tree | 77256541a62d2d7f1aaeaad977f632a2543b9ca1 /main/manager.c | |
| parent | 5a28a27b0b6cc74309cb93b5e4743aa3796ba845 (diff) | |
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
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/manager.c b/main/manager.c index 4f8a151b1..961ed5786 100644 --- 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); |