diff options
| author | Joshua Colp <jcolp@digium.com> | 2009-12-02 20:10:07 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2009-12-02 20:10:07 +0000 |
| commit | d0e431ce3deb6072de7688fb42bd658160684427 (patch) | |
| tree | ae0d99708f5135d40d5665c735ab552db330c326 /main | |
| parent | fecbfc2ec15bfa70de6a6f0ce06b255cf9210f2b (diff) | |
Add an 'X' option to the asterisk application which enables #exec for configuration files.
This option can be used to enable #exec support in the asterisk.conf configuration file.
(closes issue #16260)
Reported by: atis
Patches:
exec_includes.patch uploaded by atis (license 242)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@232510 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 4dee9da53..f8f3fa468 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2777,6 +2777,7 @@ static int show_cli_help(void) { printf(" of output to the CLI\n"); printf(" -v Increase verbosity (multiple v's = more verbose)\n"); printf(" -x <cmd> Execute command <cmd> (only valid with -r)\n"); + printf(" -X Execute includes by default (allows #exec in asterisk.conf)\n"); printf(" -W Adjust terminal colors to compensate for a light background\n"); printf("\n"); return 0; @@ -3141,7 +3142,7 @@ int main(int argc, char *argv[]) if (getenv("HOME")) snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME")); /* Check for options */ - while ((c = getopt(argc, argv, "BC:cde:FfG:ghIiL:M:mnpqRrs:TtU:VvWx:")) != -1) { + while ((c = getopt(argc, argv, "BC:cde:FfG:ghIiL:M:mnpqRrs:TtU:VvWXx:")) != -1) { /*!\note Please keep the ordering here to alphabetical, capital letters * first. This will make it easier in the future to select unused * option flags for new features. */ @@ -3150,6 +3151,9 @@ int main(int argc, char *argv[]) ast_set_flag(&ast_options, AST_OPT_FLAG_FORCE_BLACK_BACKGROUND); ast_clear_flag(&ast_options, AST_OPT_FLAG_LIGHT_BACKGROUND); break; + case 'X': + ast_set_flag(&ast_options, AST_OPT_FLAG_EXEC_INCLUDES); + break; case 'C': ast_copy_string(cfg_paths.config_file, optarg, sizeof(cfg_paths.config_file)); ast_set_flag(&ast_options, AST_OPT_FLAG_OVERRIDE_CONFIG); |