]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_pjsip_config_wizard: Change FILEUNCHANGED config_load2 flag determination
authorGeorge Joseph <george.joseph@fairview5.com>
Wed, 17 Dec 2014 23:06:01 +0000 (23:06 +0000)
committerGeorge Joseph <george.joseph@fairview5.com>
Wed, 17 Dec 2014 23:06:01 +0000 (23:06 +0000)
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

res/res_pjsip_config_wizard.c

index e5573aaa7657d61f08a2712b13b27ea83a21b6d4..86187ee3f88781d8eb712a09308124da2b919f2e 100644 (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);