Skip to content
Snippets Groups Projects
Commit 2604a835 authored by Naveen Albert's avatar Naveen Albert Committed by Kevin Harwell
Browse files

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
parent d9ce2a65
No related branches found
No related tags found
3 merge requests!138Merge branch asterisk-20.3.0 into devel properly,!123Merge asterisk '20.3.0' into devel,!118Draft: manager: AOC-S support for AOCMessage
...@@ -3725,13 +3725,18 @@ int main(int argc, char *argv[]) ...@@ -3725,13 +3725,18 @@ int main(int argc, char *argv[])
switch (c) { switch (c) {
/* okay to run with remote console */ /* okay to run with remote console */
case 'B': /* force black background */ case 'B': /* force black background */
case 'C': /* set config path */
case 'd': /* debug */ case 'd': /* debug */
case 'h': /* help */ case 'h': /* help */
case 'I': /* obsolete timing option: warning already thrown if used */ case 'I': /* obsolete timing option: warning already thrown if used */
case 'L': /* max load */ case 'L': /* max load */
case 'M': /* max calls */ 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': /* reconnect */
case 'r': /* remote */ case 'r': /* remote */
/*! \note Can ONLY be used with remote console */
case 's': /* set socket path */ case 's': /* set socket path */
case 'V': /* version */ case 'V': /* version */
case 'v': /* verbose */ case 'v': /* verbose */
...@@ -3741,7 +3746,6 @@ int main(int argc, char *argv[]) ...@@ -3741,7 +3746,6 @@ int main(int argc, char *argv[])
break; break;
/* can only be run when Asterisk is starting */ /* can only be run when Asterisk is starting */
case 'X': /* enables #exec for asterisk.conf only. */ case 'X': /* enables #exec for asterisk.conf only. */
case 'C': /* set config path */
case 'c': /* foreground console */ case 'c': /* foreground console */
case 'e': /* minimum memory free */ case 'e': /* minimum memory free */
case 'F': /* always fork */ case 'F': /* always fork */
...@@ -3749,10 +3753,8 @@ int main(int argc, char *argv[]) ...@@ -3749,10 +3753,8 @@ int main(int argc, char *argv[])
case 'G': /* run group */ case 'G': /* run group */
case 'g': /* dump core */ case 'g': /* dump core */
case 'i': /* init keys */ case 'i': /* init keys */
case 'm': /* mute */
case 'n': /* no color */ case 'n': /* no color */
case 'p': /* high priority */ case 'p': /* high priority */
case 'q': /* quiet */
case 'T': /* timestamp */ case 'T': /* timestamp */
case 't': /* cache record files */ case 't': /* cache record files */
case 'U': /* run user */ case 'U': /* run user */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment