Author: file Date: Sat Dec 20 14:57:47 2014 New Revision: 429895 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429895 Log: acl: Fix reloading of configuration if configuration file does not exist at startup.
The named ACL code incorrectly destroyed the config options information if loading of the configuration file failed at startup. This would result in reloading also failing even if a valid configuration file was put in place. ASTERISK-23733 #close Reported by: Richard Kenner ........ Merged revisions 429893 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 429894 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/main/named_acl.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/main/named_acl.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/named_acl.c?view=diff&rev=429895&r1=429894&r2=429895 ============================================================================== --- trunk/main/named_acl.c (original) +++ trunk/main/named_acl.c Sat Dec 20 14:57:47 2014 @@ -590,10 +590,7 @@ aco_option_register(&cfg_info, "permit", ACO_EXACT, named_acl_types, NULL, OPT_ACL_T, 1, FLDSET(struct named_acl, ha)); aco_option_register(&cfg_info, "deny", ACO_EXACT, named_acl_types, NULL, OPT_ACL_T, 0, FLDSET(struct named_acl, ha)); - if (aco_process_config(&cfg_info, 0)) { - aco_info_destroy(&cfg_info); - return 0; - } + aco_process_config(&cfg_info, 0); return 0; } -- _____________________________________________________________________ -- 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
