From: Kevin P. Fleming Date: Mon, 5 Jun 2006 14:00:13 +0000 (+0000) Subject: it's time... only enable global priority jumping if the config file says to do so X-Git-Tag: 1.4.0-beta1~1053 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd6de5ee4e1bba92a35125919908798013f744d3;p=thirdparty%2Fasterisk.git it's time... only enable global priority jumping if the config file says to do so git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32281 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample index cb3384deac..f74f350a1a 100644 --- a/configs/extensions.conf.sample +++ b/configs/extensions.conf.sample @@ -50,7 +50,7 @@ clearglobalvars=no ; of Asterisk). Individual applications can also be requested to do this ; by passing a 'j' option in their arguments. ; -priorityjumping=no +;priorityjumping=yes ; ; You can include other config files, use the #include command ; (without the ';'). Note that this is different from the "include" command diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index d8f4d6d768..ae3458de06 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1358,7 +1358,7 @@ static void pbx_load_config(const char *config_file) write_protect_config = ast_true(ast_variable_retrieve(cfg, "general", "writeprotect")); autofallthrough_config = ast_true(ast_variable_retrieve(cfg, "general", "autofallthrough")); clearglobalvars_config = ast_true(ast_variable_retrieve(cfg, "general", "clearglobalvars")); - ast_set2_flag(&ast_options, !ast_false(ast_variable_retrieve(cfg, "general", "priorityjumping")), AST_OPT_FLAG_PRIORITY_JUMPING); + ast_set2_flag(&ast_options, ast_true(ast_variable_retrieve(cfg, "general", "priorityjumping")), AST_OPT_FLAG_PRIORITY_JUMPING); for (v = ast_variable_browse(cfg, "globals"); v; v = v->next) { memset(realvalue, 0, sizeof(realvalue));