]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Do not consider failure to read the configuration file in chan_motif to be a show...
authorJoshua Colp <jcolp@digium.com>
Wed, 11 Jul 2012 16:42:01 +0000 (16:42 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 11 Jul 2012 16:42:01 +0000 (16:42 +0000)
(closes issue ASTERISK-20103)
Reported by: Terry Wilson

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369936 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_motif.c

index ff39bf1e12d63f5a0651b88419a8ce9e46c2b436..52d15d00a55bba0525c220088708296e40ecc591 100644 (file)
@@ -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())) {