Ensure that \r\n is printed after the ActionID in an OriginateResponse.

(closes issue #14847)
Reported by: kobaz

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

diff --git a/main/manager.c b/main/manager.c
index e88af7f98a0845f6a8ab987006a783b654971ad7..6ed6a75c6ec6cd281d6ed750baa05b2e715577cf 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -1821,7 +1821,7 @@ static void *fast_originate(void *data)
                snprintf(requested_channel, AST_CHANNEL_NAME, "%s/%s", in->tech, in->data);     
        /* Tell the manager what happened with the channel */
        manager_event(EVENT_FLAG_CALL, "OriginateResponse",
-               "%s"
+               "%s%s"
                "Response: %s\r\n"
                "Channel: %s\r\n"
                "Context: %s\r\n"
@@ -1831,7 +1831,8 @@ static void *fast_originate(void *data)
                "CallerID: %s\r\n"              /* This parameter is deprecated and will be removed post-1.4 */
                "CallerIDNum: %s\r\n"
                "CallerIDName: %s\r\n",
-               in->idtext, res ? "Failure" : "Success", chan ? chan->name : requested_channel, in->context, in->exten, reason, 
+               in->idtext, ast_strlen_zero(in->idtext) ? "" : "\r\n", res ? "Failure" : "Success", 
+               chan ? chan->name : requested_channel, in->context, in->exten, reason, 
                chan ? chan->uniqueid : "<null>",
                S_OR(in->cid_num, "<unknown>"),
                S_OR(in->cid_num, "<unknown>"),
@@ -1931,7 +1932,7 @@ static int action_originate(struct mansession *s, const struct message *m)
                        res = -1;
                } else {
                        if (!ast_strlen_zero(id))
-                               snprintf(fast->idtext, sizeof(fast->idtext), "ActionID: %s\r\n", id);
+                               snprintf(fast->idtext, sizeof(fast->idtext), "ActionID: %s", id);
                        ast_copy_string(fast->tech, tech, sizeof(fast->tech));
                        ast_copy_string(fast->data, data, sizeof(fast->data));
                        ast_copy_string(fast->app, app, sizeof(fast->app));