Author: gtjoseph Date: Wed Dec 17 17:05:24 2014 New Revision: 429699 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429699 Log: res_pjsip_config_wizard: Change FILEUNCHANGED config_load2 flag determination
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/ Modified: branches/13/res/res_pjsip_config_wizard.c Modified: branches/13/res/res_pjsip_config_wizard.c URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_pjsip_config_wizard.c?view=diff&rev=429699&r1=429698&r2=429699 ============================================================================== --- branches/13/res/res_pjsip_config_wizard.c (original) +++ branches/13/res/res_pjsip_config_wizard.c Wed Dec 17 17:05:24 2014 @@ -801,7 +801,7 @@ 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 @@ 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); -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
