From: Madhan A K Date: Tue, 11 Feb 2014 08:32:30 +0000 (+0530) Subject: Adding multi user support for the module, Fixed review comments. X-Git-Tag: submit/tizen/20140528.094608^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e52f4be1a1c8d4cfe00e9cc98f52e1c662d22a3;p=platform%2Fcore%2Fsecurity%2Fprivilege-checker.git Adding multi user support for the module, Fixed review comments. Bug-Tizen: PTREL-266 Change-Id: I2cd066ae71316648bd85113cb0f4b4cc8f58153b Signed-off-by: Madhan A K --- diff --git a/packaging/privilege-checker.spec b/packaging/privilege-checker.spec index c186cba..1a454bc 100644 --- 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 c6b4960..426b687 100644 --- a/util/CMakeLists.txt +++ b/util/CMakeLists.txt @@ -10,7 +10,7 @@ SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include") INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED dlog sqlite3 libxml-2.0 ) +pkg_check_modules(pkgs REQUIRED dlog sqlite3 libxml-2.0 libtzplatform-config) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/util/src/DbManager.cpp b/util/src/DbManager.cpp index 540efdc..853173e 100644 --- a/util/src/DbManager.cpp +++ b/util/src/DbManager.cpp @@ -17,9 +17,10 @@ #include #include #include +#include -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)