diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_mwi_external.c | 6 | ||||
| -rw-r--r-- | res/res_pjsip/config_system.c | 2 | ||||
| -rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/res/res_mwi_external.c b/res/res_mwi_external.c index 875f32773..c3fc0eaf4 100644 --- a/res/res_mwi_external.c +++ b/res/res_mwi_external.c @@ -163,8 +163,10 @@ static int mwi_sorcery_init(void) } /* Map the external MWI wizards. */ - if (ast_sorcery_apply_default(mwi_sorcery, MWI_MAILBOX_TYPE, "astdb", - MWI_ASTDB_PREFIX) == AST_SORCERY_APPLY_FAIL) { + res = !!ast_sorcery_apply_config(mwi_sorcery, "res_mwi_external"); + res &= !!ast_sorcery_apply_default(mwi_sorcery, MWI_MAILBOX_TYPE, "astdb", + MWI_ASTDB_PREFIX); + if (res) { ast_log(LOG_ERROR, "MWI external: Sorcery could not setup wizards.\n"); return -1; } diff --git a/res/res_pjsip/config_system.c b/res/res_pjsip/config_system.c index 8fae6b74c..bdf53149f 100644 --- a/res/res_pjsip/config_system.c +++ b/res/res_pjsip/config_system.c @@ -116,6 +116,8 @@ int ast_sip_initialize_system(void) return -1; } + ast_sorcery_apply_config(system_sorcery, "res_pjsip"); + ast_sorcery_apply_default(system_sorcery, "system", "config", "pjsip.conf,criteria=type=system"); if (ast_sorcery_object_register_no_reload(system_sorcery, "system", system_alloc, NULL, system_apply)) { diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c index 0a3433450..1f289ade9 100644 --- a/res/res_pjsip/pjsip_configuration.c +++ b/res/res_pjsip/pjsip_configuration.c @@ -1619,6 +1619,8 @@ int ast_res_pjsip_initialize_configuration(const struct ast_module_info *ast_mod return -1; } + ast_sorcery_apply_config(sip_sorcery, "res_pjsip"); + ast_sip_initialize_cli(); if (ast_sip_initialize_sorcery_auth()) { |