automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@16599 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/asterisk.c b/asterisk.c
index f29d7e182a30e1b3f0a1f5cbae4f9d8f815a3ccb..40b822f69fb63573c9b677c44257754b4430854c 100644 (file)
--- a/asterisk.c
+++ b/asterisk.c
@@ -1875,7 +1875,7 @@ static void ast_readconfig(void) {
        /* init with buildtime config */
        ast_copy_string(ast_config_AST_CONFIG_DIR, AST_CONFIG_DIR, sizeof(ast_config_AST_CONFIG_DIR));
        ast_copy_string(ast_config_AST_SPOOL_DIR, AST_SPOOL_DIR, sizeof(ast_config_AST_SPOOL_DIR));
-       ast_copy_string(ast_config_AST_MODULE_DIR, AST_MODULE_DIR, sizeof(ast_config_AST_VAR_DIR));
+       ast_copy_string(ast_config_AST_MODULE_DIR, AST_MODULE_DIR, sizeof(ast_config_AST_MODULE_DIR));
        snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", ast_config_AST_SPOOL_DIR);
        ast_copy_string(ast_config_AST_VAR_DIR, AST_VAR_DIR, sizeof(ast_config_AST_VAR_DIR));
        ast_copy_string(ast_config_AST_LOG_DIR, AST_LOG_DIR, sizeof(ast_config_AST_LOG_DIR));

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5308b9ecd9f7d2b9595589fad91b7c9e7dcae375..85880cdcc677dca0b2f726ba8cb84711703342dc 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8071,11 +8071,7 @@ static int _sip_show_peer(int type, int fd, struct mansession *s, struct message
                ast_cli(fd,"\n");
                ASTOBJ_UNREF(peer,sip_destroy_peer);
        } else  if (peer && type == 1) { /* manager listing */
-               char *actionid = astman_get_header(m,"ActionID");
-
                ast_cli(fd, "Channeltype: SIP\r\n");
-               if (actionid)
-                       ast_cli(fd, "ActionID: %s\r\n", actionid);
                ast_cli(fd, "ObjectName: %s\r\n", peer->name);
                ast_cli(fd, "ChanObjectType: peer\r\n");
                ast_cli(fd, "SecretExist: %s\r\n", ast_strlen_zero(peer->secret)?"N":"Y");
@@ -8108,7 +8104,7 @@ static int _sip_show_peer(int type, int fd, struct mansession *s, struct message
                ast_cli(fd, "SIP-UserPhone: %s\r\n", (ast_test_flag(peer, SIP_USEREQPHONE)?"Y":"N"));
 
                /* - is enumerated */
-               ast_cli(fd, "SIP-DTMFmode %s\r\n", dtmfmode2str(ast_test_flag(peer, SIP_DTMF)));
+               ast_cli(fd, "SIP-DTMFmode: %s\r\n", dtmfmode2str(ast_test_flag(peer, SIP_DTMF)));
                ast_cli(fd, "SIPLastMsg: %d\r\n", peer->lastmsg);
                ast_cli(fd, "ToHost: %s\r\n", peer->tohost);
                ast_cli(fd, "Address-IP: %s\r\nAddress-Port: %d\r\n",  peer->addr.sin_addr.s_addr ? ast_inet_ntoa(iabuf, sizeof(iabuf), peer->addr.sin_addr) : "", ntohs(peer->addr.sin_port));