From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 26 Sep 2006 20:49:21 +0000 (+0000)
Subject: Back in revision 4798, this message was changed from using ast_cli() to directly
X-Git-Tag: 1.2.13~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c2fee974aa0758c7282282504c4eca5ec2ce662;p=thirdparty%2Fasterisk.git

Back in revision 4798, this message was changed from using ast_cli() to directly
calling write().  During this change, checking if this was a remote console was
removed.  This caused this message about using "exit" or "quit" to exit an
Asterisk console to come up in times where it did not make sense.  This change
restores the check to see if this is a remote console before printing the
message.  (fixes BE-4)


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

diff --git a/asterisk.c b/asterisk.c
index a5f07a2b22..9cfdc565d5 100644
--- a/asterisk.c
+++ b/asterisk.c
@@ -2417,7 +2417,7 @@ int main(int argc, char *argv[])
 					buf[strlen(buf)-1] = '\0';
 
 				consolehandler((char *)buf);
-			} else {
+			} else if (option_remote) {
 				if (write(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n",
 					  strlen("\nUse EXIT or QUIT to exit the asterisk console\n")) < 0) {
 					/* Whoa, stdout disappeared from under us... Make /dev/null's */