[asterisk-commits] file: trunk r369936 - /trunk/channels/chan_motif.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Jul 11 11:42:01 2012
New Revision: 369936

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

Modified:
    trunk/channels/chan_motif.c

Modified: trunk/channels/chan_motif.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_motif.c?view=diff&rev=369936&r1=369935&r2=369936
==============================================================================
--- trunk/channels/chan_motif.c (original)
+++ trunk/channels/chan_motif.c Wed Jul 11 11:42:01 2012
@@ -2494,7 +2494,8 @@
 
 	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())) {