From: Joshua Colp <jcolp@digium.com>
Date: Sat, 20 Dec 2014 20:56:35 +0000 (+0000)
Subject: acl: Fix reloading of configuration if configuration file does not exist at startup.
X-Git-Tag: 11.16.0-rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a77d50cf2e1ebaa944594744c7b9836e2796f36e;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@429893 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/named_acl.c b/main/named_acl.c
index 9f4a0e60ec..9929ee12ce 100644
--- a/main/named_acl.c
+++ b/main/named_acl.c
@@ -577,10 +577,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;
 }