From f88460115fab0fb7171e3da23d9418579d198fa4 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Sat, 20 Dec 2014 20:57:19 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429894 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/named_acl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main/named_acl.c b/main/named_acl.c index deda260b7d..3b81c8c382 100644 --- a/main/named_acl.c +++ b/main/named_acl.c @@ -590,10 +590,7 @@ int ast_named_acl_init() 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; } -- 2.47.2