denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't define a default database URI

Browse Source
This commit is contained in:
Andreas Steffen
2013-06-21 23:25:22 +02:00
parent 1ecff25917
commit 4f6bf1a843
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/imcv.c
+1 -2
View File
@@ -23,7 +23,6 @@
#include <syslog.h> #include <syslog.h>
#define IMCV_DEBUG_LEVEL 1 #define IMCV_DEBUG_LEVEL 1
#define IMCV_DEFAULT_DATABASE_URI "sqlite:///etc/pts/config.db"
#define IMCV_DEFAULT_POLICY_SCRIPT "ipsec _imv_policy" #define IMCV_DEFAULT_POLICY_SCRIPT "ipsec _imv_policy"
@@ -150,7 +149,7 @@ bool libimcv_init(bool is_imv)
if (is_imv) if (is_imv)
{ {
uri = lib->settings->get_str(lib->settings, uri = lib->settings->get_str(lib->settings,
"libimcv.database", IMCV_DEFAULT_DATABASE_URI); "libimcv.database", NULL);
script = lib->settings->get_str(lib->settings, script = lib->settings->get_str(lib->settings,
"libimcv.policy_script", IMCV_DEFAULT_POLICY_SCRIPT); "libimcv.policy_script", IMCV_DEFAULT_POLICY_SCRIPT);
if (uri) if (uri)
src/libimcv/imv/imv_database.c
+1 -1
View File
@@ -303,7 +303,7 @@ METHOD(imv_database_t, get_database, database_t*,
METHOD(imv_database_t, destroy, void, METHOD(imv_database_t, destroy, void,
private_imv_database_t *this) private_imv_database_t *this)
{ {
this->db->destroy(this->db); DESTROY_IF(this->db);
this->sessions->destroy_offset(this->sessions, this->sessions->destroy_offset(this->sessions,
offsetof(imv_session_t, destroy)); offsetof(imv_session_t, destroy));
this->mutex->destroy(this->mutex); this->mutex->destroy(this->mutex);
src/libimcv/imv/imv_policy_manager.c
+2 -3
View File
@@ -142,9 +142,8 @@ int main(int argc, char *argv[])
} }
session_id = atoi(tnc_session_id); session_id = atoi(tnc_session_id);
/* attach database */ /* attach IMV database */
uri = lib->settings->get_str(lib->settings, "imv_policy_manager.database", uri = lib->settings->get_str(lib->settings, "libimcv.database", NULL);
"sqlite:///etc/pts/config.db");
db = lib->db->create(lib->db, uri); db = lib->db->create(lib->db, uri);
if (!db) if (!db)
{ {