diff options
| author | Corey Farrell <git@cfware.com> | 2015-05-06 09:31:33 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-05-12 12:44:12 -0400 |
| commit | 57386dcb67a54b14cf395802669cf432a777e94b (patch) | |
| tree | 481dd3879426e499ef6b2e02edef53260c31af16 /include/asterisk/options.h | |
| parent | cc853dcf90dbe2f03c6f58879df86a01a85a9581 (diff) | |
Allow command-line options to override asterisk.conf.
Previous versions of Asterisk processed command-line options before
processing asterisk.conf. This meant that if an option was set in
asterisk.conf, it could not be overridden with the equivelent command
line option. This change causes Asterisk to process the command-line
twice. First it processes options that are needed to load asterisk.conf,
then it processes the remaining options after the config is read.
This changes the function of -X slightly. Previously using -X without
disabling execincludes in asterisk.conf caused #exec to be usable in any
config. Now -X only enables #exec for the load of asterisk.conf, if it
is wanted in the rest of the system it must be enabled with execincludes
in asterisk.conf. Updated 'asterisk -h' and 'man asterisk' to reflect
the limited function of -X.
ASTERISK-25042 #close
Reported by: Corey Farrell
Change-Id: I1450d45c15b4467274b871914d893ed4f6564cd7
Diffstat (limited to 'include/asterisk/options.h')
| -rw-r--r-- | include/asterisk/options.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asterisk/options.h b/include/asterisk/options.h index a08b8638c..e2709f918 100644 --- a/include/asterisk/options.h +++ b/include/asterisk/options.h @@ -66,8 +66,6 @@ enum ast_option_flags { AST_OPT_FLAG_CACHE_RECORD_FILES = (1 << 13), /*! Display timestamp in CLI verbose output */ AST_OPT_FLAG_TIMESTAMP = (1 << 14), - /*! Override config */ - AST_OPT_FLAG_OVERRIDE_CONFIG = (1 << 15), /*! Reconnect */ AST_OPT_FLAG_RECONNECT = (1 << 16), /*! Transmit Silence during Record() and DTMF Generation */ @@ -119,7 +117,6 @@ enum ast_option_flags { #define ast_opt_dump_core ast_test_flag(&ast_options, AST_OPT_FLAG_DUMP_CORE) #define ast_opt_cache_record_files ast_test_flag(&ast_options, AST_OPT_FLAG_CACHE_RECORD_FILES) #define ast_opt_timestamp ast_test_flag(&ast_options, AST_OPT_FLAG_TIMESTAMP) -#define ast_opt_override_config ast_test_flag(&ast_options, AST_OPT_FLAG_OVERRIDE_CONFIG) #define ast_opt_reconnect ast_test_flag(&ast_options, AST_OPT_FLAG_RECONNECT) #define ast_opt_transmit_silence ast_test_flag(&ast_options, AST_OPT_FLAG_TRANSMIT_SILENCE) #define ast_opt_dont_warn ast_test_flag(&ast_options, AST_OPT_FLAG_DONT_WARN) |