kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip_config_wizard: Change FILEUNCHANGED config_load2 flag determination

Browse Source 
The module now applies the FILEUNCHANGED flag when both reloaded is
specified AND there's no last_config for the object type.

Tested-by: George Joseph

Review: https://reviewboard.asterisk.org/r/4276/
........

Merged revisions 429699 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429700 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
George Joseph
2014-12-17 23:06:01 +00:00
parent 8b6ecc449c
commit c4360796f7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_pjsip_config_wizard.c
View File

@@ -801,7 +801,7 @@ static void object_type_loaded_observer(const char *name,
struct ast_category *category = NULL;
struct object_type_wizard *otw = NULL;
char *filename = "pjsip_wizard.conf";
struct ast_flags flags = { CONFIG_FLAG_NOCACHE };
struct ast_flags flags = { 0 };
struct ast_config *cfg;
if (!strstr("auth aor endpoint identify registration phoneprov", object_type)) {
@@ -815,8 +815,8 @@ static void object_type_loaded_observer(const char *name,
return;
}
if (reloaded) {
flags.flags |= CONFIG_FLAG_FILEUNCHANGED;
if (reloaded && otw->last_config) {
flags.flags = CONFIG_FLAG_FILEUNCHANGED;
}
cfg = ast_config_load2(filename, object_type, flags);