summaryrefslogtreecommitdiff
path: root/main/config.c
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2010-07-20 19:35:02 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2010-07-20 19:35:02 +0000
commitb4e18d5660fcc13b97cd4682ff48e33aa9d15d83 (patch)
tree14b50e57a2595242548184d532cbeeedf416020a /main/config.c
parent293bdffe709fc7d37139b0b9be6b67193d621b51 (diff)
Add load priority order, such that preload becomes unnecessary in most cases
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/config.c')
-rw-r--r--main/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/config.c b/main/config.c
index f65c69e53..1ed46b77c 100644
--- a/main/config.c
+++ b/main/config.c
@@ -1896,7 +1896,7 @@ int read_config_maps(void)
struct ast_config *config, *configtmp;
struct ast_variable *v;
char *driver, *table, *database, *stringp, *tmp;
- struct ast_flags flags = { 0 };
+ struct ast_flags flags = { CONFIG_FLAG_NOREALTIME };
clear_config_maps();
@@ -2060,7 +2060,7 @@ struct ast_config *ast_config_internal_load(const char *filename, struct ast_con
cfg->include_level++;
- if (strcmp(filename, extconfig_conf) && strcmp(filename, "asterisk.conf") && config_engine_list) {
+ if (!ast_test_flag(&flags, CONFIG_FLAG_NOREALTIME) && config_engine_list) {
struct ast_config_engine *eng;
eng = find_engine(filename, db, sizeof(db), table, sizeof(table));