]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Don't print the CR-NL combination when we aren't outputting to the manager.
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 20 Feb 2009 22:59:52 +0000 (22:59 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 20 Feb 2009 22:59:52 +0000 (22:59 +0000)
An embedded CR-NL in a CLI command screws up several AMI parsers that don't
expect to see that combination in the middle of output.

(Closes issue #14305)
Reported by: martins
Patch by: tilghman

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

main/pbx.c

index b5ef431060d7ac47ba096f09428c2f7445a8c4fd..78b200940a3b59e771ad73fc804bc1470bc46344 100644 (file)
@@ -3660,7 +3660,7 @@ static int show_dialplan_helper(int fd, const char *context, const char *exten,
 
                /* if we print something in context, make an empty line */
                if (context_info_printed)
-                       ast_cli(fd, "\r\n");
+                       ast_cli(fd, "\n");
        }
        ast_unlock_contexts();