From: Jason Parker <jparker@digium.com>
Date: Mon, 17 Sep 2007 21:52:07 +0000 (+0000)
Subject: Don't try to continue loading cdr_sqlite3_custom on a module load failure (such as... 
X-Git-Tag: 1.6.0-beta1~3^2~1397
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d1abc92fe676c428d838cc128907f715c794e1b;p=thirdparty%2Fasterisk.git

Don't try to continue loading cdr_sqlite3_custom on a module load failure (such as the config not existing)

Closes issue #10749, patch by seanbright.


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

diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index 1c663362b7..c6eb8b5ba4 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -209,7 +209,8 @@ static int load_module(void)
 			ast_log(LOG_ERROR, "%s: Unable to register custom SQLite3 CDR handling\n", name);
 			return AST_MODULE_LOAD_DECLINE;
 		}
-	}
+	} else
+		return AST_MODULE_LOAD_DECLINE;
 
 	/* is the database there? */
 	snprintf(fn, sizeof(fn), "%s/master.db", ast_config_AST_LOG_DIR);