Adding multi user support for the module, Fixed review comments.

Bug-Tizen: PTREL-266

Change-Id: I2cd066ae71316648bd85113cb0f4b4cc8f58153b
Signed-off-by: Madhan A K <madhan.ak@samsung.com>

diff --git a/packaging/privilege-checker.spec b/packaging/privilege-checker.spec
index c186cbafb65bd6c69dc56a23544c3a8726789ffd..1a454bcdbb80a761c67d32e97a0b046116facec6 100644 (file)
--- a/packaging/privilege-checker.spec
+++ b/packaging/privilege-checker.spec
@@ -10,6 +10,7 @@ BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(capi-base-common)
 BuildRequires: pkgconfig(libwbxml2)
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 Privilege Management
@@ -69,15 +70,15 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE.APLv2 %{buildroot}/usr/share/license/privilege-checker
-mkdir -p %{buildroot}/opt/dbspace
-cp util/res/opt/dbspace/.privilegelist.db /%{buildroot}/opt/dbspace/
+mkdir -p %{buildroot}%{TZ_SYS_DB}
+cp util/res%{TZ_SYS_DB}/.privilegelist.db /%{buildroot}/%{TZ_SYS_DB}/
 
 %make_install
 
 %files -n privilege-checker
 /usr/share/license/privilege-checker
-/usr/bin/*
-/opt/dbspace/.privilegelist.db
+%{TZ_SYS_BIN}/*
+%{TZ_SYS_DB}/.privilegelist.db
 %manifest packaging/privilege-checker.manifest
 
 %files -n capi-security-privilege-manager

diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
index c6b4960baa91e531913ec4a319a2cce6c28b35c2..426b687f938971d4dd6d29e7f83d7f50be620551 100644 (file)
--- a/util/CMakeLists.txt
+++ b/util/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")\r
 \r
 INCLUDE(FindPkgConfig)\r
-pkg_check_modules(pkgs REQUIRED dlog sqlite3 libxml-2.0        )\r
+pkg_check_modules(pkgs REQUIRED dlog sqlite3 libxml-2.0 libtzplatform-config)\r
 \r
 FOREACH(flag ${pkgs_CFLAGS})\r
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")\r

diff --git a/util/src/DbManager.cpp b/util/src/DbManager.cpp
index 540efdc7cf1ead6f8ff173032e5bca0f75aef34d..853173e67d388da84c54914545f0cecc48859384 100644 (file)
--- a/util/src/DbManager.cpp
+++ b/util/src/DbManager.cpp
@@ -17,9 +17,10 @@
 #include <DbManager.h>
 #include <Util.h>
 #include <dlog.h>
+#include <tzplatform_config.h>
 
-static const char PRIVACY_INFO_DB_PATH[] = "/opt/dbspace/.privacylist.db";
-static const char PRIVILEGE_INFO_DB_PATH[] = "/opt/dbspace/.privilegelist.db";
+#define PRIVACY_INFO_DB_PATH tzplatform_mkpath(TZ_SYS_DB, ".privacylist.db")
+#define PRIVILEGE_INFO_DB_PATH tzplatform_mkpath(TZ_SYS_DB, ".privilegelist.db")
 
 int
 DbManager::InsertPrivacy(const PrivacyInfo* pPrivacyInfo)