From: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Date: Fri, 18 Jul 2014 19:58:32 +0000 (+0200)
Subject: Fix usage of local state directory in Cynara service
X-Git-Tag: accepted/tizen/common/20140722.142604~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d669d4295d02dde4691aef628547139c0a587e26;p=platform%2Fcore%2Fsecurity%2Fcynara.git

Fix usage of local state directory in Cynara service

Change-Id: I66f60b919edf7f36a1de3d21db81bef5b9245485
---

diff --git a/packaging/cynara.spec b/packaging/cynara.spec
index 59ef5e2..11c630b 100644
--- a/packaging/cynara.spec
+++ b/packaging/cynara.spec
@@ -86,7 +86,7 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 
-export CXXFLAGS="$CXXFLAGS -DCYNARA_DB_PATH=\\\"%{state_path}\\\""
+export CXXFLAGS="$CXXFLAGS -DCYNARA_STATE_PATH=\\\"%{state_path}\\\""
 export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 
 %cmake . -DVERSION=%{version} \
diff --git a/src/service/main/Cynara.cpp b/src/service/main/Cynara.cpp
index 20bb0ab..8ad22e2 100644
--- a/src/service/main/Cynara.cpp
+++ b/src/service/main/Cynara.cpp
@@ -45,15 +45,16 @@ Cynara::~Cynara() {
 }
 
 const std::string Cynara::storageDir(void) const {
-    std::string dir("/var/lib/cynara/db/");
+    std::string dir("/var/lib/cynara/");
 
-#ifdef CYNARA_DB_PATH
-    dir = CYNARA_DB_PATH;
+#ifdef CYNARA_STATE_PATH
+    dir = CYNARA_STATE_PATH;
 #else
-    LOGW("Cynara compiled without CYNARA_DB_PATH flag. Using default database directory.");
+    LOGW("Cynara compiled without CYNARA_STATE_PATH flag. Using default database directory.");
 #endif
 
-    LOGI("Cynara database path = <%s>", dir.c_str());
+    dir += "db/";
+    LOGI("Cynara database path <%s>", dir.c_str());
     return dir;
 }