aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-10 22:35:49 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-10 22:35:49 +0000
commit86aaf263a6fcbfc83ccf2212aa1c2593a58dd091 (patch)
tree634754e27bda04a505f2594ad237fc9a02142fe1
parentcff642e810b880ab8c7b8bdb354c479e02d69e07 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@307535 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xcontrib/init.d/rc.debian.asterisk2
-rw-r--r--main/asterisk.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index 88f220bfa..4d9bb15f1 100755
--- 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 4c79aee6c..431a9eaaa 100644
--- 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':