From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 17 May 2013 20:32:04 +0000 (+0200)
Subject: don't define a default database URI
X-Git-Tag: 5.1.0dr1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f6bf1a8430f73ec32cfab97adf00a89fa2b3120;p=thirdparty%2Fstrongswan.git

don't define a default database URI
---

diff --git a/src/libimcv/imcv.c b/src/libimcv/imcv.c
index cb0222e0ea..de859011ce 100644
--- a/src/libimcv/imcv.c
+++ b/src/libimcv/imcv.c
@@ -23,7 +23,6 @@
 #include <syslog.h>
 
 #define IMCV_DEBUG_LEVEL			1
-#define IMCV_DEFAULT_DATABASE_URI	"sqlite:///etc/pts/config.db"
 #define IMCV_DEFAULT_POLICY_SCRIPT	"ipsec _imv_policy"
 
 
@@ -150,7 +149,7 @@ bool libimcv_init(bool is_imv)
 		if (is_imv)
 		{
 			uri = lib->settings->get_str(lib->settings,
-						"libimcv.database", IMCV_DEFAULT_DATABASE_URI);
+						"libimcv.database", NULL);
 			script = lib->settings->get_str(lib->settings,
 						"libimcv.policy_script", IMCV_DEFAULT_POLICY_SCRIPT);
 			if (uri)
diff --git a/src/libimcv/imv/imv_database.c b/src/libimcv/imv/imv_database.c
index 4c35d75040..2703ae2500 100644
--- a/src/libimcv/imv/imv_database.c
+++ b/src/libimcv/imv/imv_database.c
@@ -303,7 +303,7 @@ METHOD(imv_database_t, get_database, database_t*,
 METHOD(imv_database_t, destroy, void,
 	private_imv_database_t *this)
 {
-	this->db->destroy(this->db);
+	DESTROY_IF(this->db);
 	this->sessions->destroy_offset(this->sessions,
 							offsetof(imv_session_t, destroy));
 	this->mutex->destroy(this->mutex);
diff --git a/src/libimcv/imv/imv_policy_manager.c b/src/libimcv/imv/imv_policy_manager.c
index 128c7a2966..7819a10907 100644
--- a/src/libimcv/imv/imv_policy_manager.c
+++ b/src/libimcv/imv/imv_policy_manager.c
@@ -142,9 +142,8 @@ int main(int argc, char *argv[])
 	}
 	session_id = atoi(tnc_session_id);
 	
-	/* attach database */
-	uri = lib->settings->get_str(lib->settings, "imv_policy_manager.database",
-												"sqlite:///etc/pts/config.db");
+	/* attach IMV database */
+	uri = lib->settings->get_str(lib->settings, "libimcv.database", NULL);
 	db = lib->db->create(lib->db, uri);
 	if (!db)
 	{