From: Naveen Albert <asterisk@phreaknet.org>
Date: Sat, 11 Jun 2022 19:29:55 +0000 (+0000)
Subject: asterisk.c: Fix incompatibility warnings for remote console.
X-Git-Tag: 16.27.0-rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7107b4dd477646a33af8745903474617bde74e5;p=thirdparty%2Fasterisk.git

asterisk.c: Fix incompatibility warnings for remote console.

A previous review fixing ASTERISK_22246 and ASTERISK_26582
got a couple of the options mixed up as to whether or not
they are compatible with the remote console. This fixes
those to the best of my knowledge.

ASTERISK-30097 #close

Change-Id: Id54166991aa79f04fb02699cc499bedda854253b
---

diff --git a/main/asterisk.c b/main/asterisk.c
index 35958bc832..bc9497f75f 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3722,13 +3722,18 @@ int main(int argc, char *argv[])
 			switch (c) {
 			/* okay to run with remote console */
 			case 'B': /* force black background */
+			case 'C': /* set config path */
 			case 'd': /* debug */
 			case 'h': /* help */
 			case 'I': /* obsolete timing option: warning already thrown if used */
 			case 'L': /* max load */
 			case 'M': /* max calls */
+			case 'm': /* mute */
+			/*! \note The q option is never used anywhere, only defined */
+			case 'q': /* quiet */
 			case 'R': /* reconnect */
 			case 'r': /* remote */
+			/*! \note Can ONLY be used with remote console */
 			case 's': /* set socket path */
 			case 'V': /* version */
 			case 'v': /* verbose */
@@ -3738,7 +3743,6 @@ int main(int argc, char *argv[])
 				break;
 			/* can only be run when Asterisk is starting */
 			case 'X': /* enables #exec for asterisk.conf only. */
-			case 'C': /* set config path */
 			case 'c': /* foreground console */
 			case 'e': /* minimum memory free */
 			case 'F': /* always fork */
@@ -3746,10 +3750,8 @@ int main(int argc, char *argv[])
 			case 'G': /* run group */
 			case 'g': /* dump core */
 			case 'i': /* init keys */
-			case 'm': /* mute */
 			case 'n': /* no color */
 			case 'p': /* high priority */
-			case 'q': /* quiet */
 			case 'T': /* timestamp */
 			case 't': /* cache record files */
 			case 'U': /* run user */