]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
acl: Fix reloading of configuration if configuration file does not exist at startup.
authorJoshua Colp <jcolp@digium.com>
Sat, 20 Dec 2014 20:56:35 +0000 (20:56 +0000)
committerJoshua Colp <jcolp@digium.com>
Sat, 20 Dec 2014 20:56:35 +0000 (20:56 +0000)
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

main/named_acl.c

index 9f4a0e60ec0f052186ee67308c96d3e9c797f30b..9929ee12ceac1bd14de7ac9868fcbfe434634944 100644 (file)
@@ -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;
 }