diff options
| author | Mark Michelson <mmichelson@digium.com> | 2014-03-17 19:35:17 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2014-03-17 19:35:17 +0000 |
| commit | eba91d2a98ac5a6558513549670162ab20ab6d68 (patch) | |
| tree | 82010a695584ef98e0ea29d87cec74b61c1c8956 /res/res_pjsip | |
| parent | d44aefeef476d744f2915d47c3fdc9b138cdd584 (diff) | |
Revert changes to sorcery that accidentally got committed.
These changes were still up for review and have not been approved
yet. I must have had the changes in my working copy when making
a different change.
........
Merged revisions 410696 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410699 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip')
| -rw-r--r-- | res/res_pjsip/config_system.c | 2 | ||||
| -rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 2 |
2 files changed, 4 insertions, 0 deletions
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()) { |