From: Joshua Colp <jcolp@digium.com>
Date: Wed, 11 Jul 2012 16:42:01 +0000 (+0000)
Subject: Do not consider failure to read the configuration file in chan_motif to be a show... 
X-Git-Tag: 11.0.0-beta1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a25b4b745751b82e810fea17b8ff3652a0908801;p=thirdparty%2Fasterisk.git

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
---

diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index ff39bf1e12..52d15d00a5 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())) {