Merged revisions 307534 via svnmerge from

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

........
  r307534 | qwell | 2011-02-10 16:33:09 -0600 (Thu, 10 Feb 2011) | 8 lines

  Remove color when executing commands via a remote console.

  Essentially this makes '-x' imply '-n' on rasterisk.  This was done in a
  different and incomplete way previously, which I'm reverting here.

  (issue #18776)
  Reported by: alecdavis
........

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

diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index 88f220bfa6bf2950f28678ebc483b345aa065c4f..4d9bb15f15b04172144e4462b8dba8e5aebd3369 100755 (executable)
--- a/contrib/init.d/rc.debian.asterisk
+++ b/contrib/init.d/rc.debian.asterisk
@@ -72,7 +72,7 @@ case "$1" in
   start)
        # Check if Asterisk is already running.  If it is, then bug out, because
        # starting up Asterisk when Asterisk is already running is very bad.
-       VERSION=`${DAEMON} -rnx 'core show version' || ${TRUE}`
+       VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}`
        if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
                echo "Asterisk is already running.  $0 will exit now."
                exit 1

diff --git a/main/asterisk.c b/main/asterisk.c
index 4c79aee6ca0522f150b6c18078e8e2753921b722..431a9eaaa0289769a0690c12bc6f84327861e677 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3250,7 +3250,7 @@ int main(int argc, char *argv[])
                        ast_set_flag(&ast_options, AST_OPT_FLAG_TIMESTAMP);
                        break;
                case 'x':
-                       ast_set_flag(&ast_options, AST_OPT_FLAG_EXEC);
+                       ast_set_flag(&ast_options, AST_OPT_FLAG_EXEC | AST_OPT_FLAG_NO_COLOR);
                        xarg = ast_strdupa(optarg);
                        break;
                case 'C':