kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert changes to sorcery that accidentally got committed.

Browse Source 
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
This commit is contained in:
Mark Michelson
2014-03-17 19:35:17 +00:00
parent d44aefeef4
commit eba91d2a98
9 changed files with 51 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/res_pjsip/config_system.c
View File

@@ -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)) {

2
res/res_pjsip/pjsip_configuration.c
View File

@@ -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()) {