diff options
author | Joshua Colp <jcolp@digium.com> | 2012-07-11 16:42:01 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2012-07-11 16:42:01 +0000 |
commit | a25b4b745751b82e810fea17b8ff3652a0908801 (patch) | |
tree | 9937ee1af8930d425c78d14dfbf3c484f0db3387 | |
parent | 9bc2127d7b3ae5c585235eda503621007c2495ab (diff) |
Do not consider failure to read the configuration file in chan_motif to be a show stopper for loading Asterisk by returning decline instead of failure.
(closes issue ASTERISK-20103)
Reported by: Terry Wilson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369936 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | channels/chan_motif.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_motif.c b/channels/chan_motif.c index ff39bf1e1..52d15d00a 100644 --- a/channels/chan_motif.c +++ b/channels/chan_motif.c @@ -2494,7 +2494,8 @@ static int load_module(void) if (aco_process_config(&cfg_info, 0)) { ast_log(LOG_ERROR, "Unable to read config file motif.conf. Not loading module.\n"); - goto end; + aco_info_destroy(&cfg_info); + return AST_MODULE_LOAD_DECLINE; } if (!(sched = ast_sched_context_create())) { |