[asterisk-commits] file: branch 13 r429894 - in /branches/13: ./ main/named_acl.c

[SVN commits to the Asterisk project]

Author: file
Date: Sat Dec 20 14:57:19 2014
New Revision: 429894

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429894
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

Modified:
    branches/13/   (props changed)
    branches/13/main/named_acl.c

Propchange: branches/13/
------------------------------------------------------------------------------
--- branch-11-merged (original)
+++ branch-11-merged Sat Dec 20 14:57:19 2014
@@ -1,1 +1,1 @@
-/branches/11:1-429517,429539,429632,429783,429804,429825,429867
+/branches/11:1-429517,429539,429632,429783,429804,429825,429867,429893

Modified: branches/13/main/named_acl.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/main/named_acl.c?view=diff&rev=429894&r1=429893&r2=429894
==============================================================================
--- branches/13/main/named_acl.c (original)
+++ branches/13/main/named_acl.c Sat Dec 20 14:57:19 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;
 }