Fix 64bit build

Change-Id: I1c308248820756da20fc572f8caf653a5f4c17b9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fe18516ae3b6469363fc699c94cf22bc45ba627..0fed206d9fa1d702d4207dd0252ab821dbcbd702 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,6 +90,7 @@ ADD_DEFINITIONS("-Wno-deprecated-declarations")               # No warnings abou
 ADD_DEFINITIONS("-Wno-implicit-fallthrough")    # No warnings about switc() statements, often done on purpose
 ADD_DEFINITIONS("-DCYNARA_DB_DIR=\"${CYNARA_DB_DIR}\"")
 ADD_DEFINITIONS("-DAPP_USER=\"${APP_USER}\"")
+ADD_DEFINITIONS("-DLIB_DIR=\"${LIB_DIR}\"")
 
 # Enabler for popups; this should be done on system-level somewhere, but since it isn't
 # and we already have such definition in security-manager, lets have it also here

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index e41bfff1eb984f0927f6bd2c01c0146e8287ad42..e64a14ca6df48640763b35c19813b1bca1a24b15 100644 (file)
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -85,7 +85,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DCKM_RW_DATA_DIR=%{ckm_rw_data_dir} \
         -DGLOBAL_APP_DIR=%{TZ_SYS_RW_APP} \
         -DLOCAL_APP_DIR="%{TZ_SYS_HOME}/security_test_user/apps_rw" \
-        -DSM_TEST_DIR="%{sm_test_dir}"
+        -DSM_TEST_DIR="%{sm_test_dir}"\
+        -DLIB_DIR:PATH=%{_libdir}
 make %{?jobs:-j%jobs}
 
 %pre

diff --git a/src/cynara-tests/common/cynara_test_commons.cpp b/src/cynara-tests/common/cynara_test_commons.cpp
index 483681f9fd786cde4245d6c23865d30fcb6e7ddd..defefda6229fbe8447033afe5619db8bcbda88d7 100644 (file)
--- a/src/cynara-tests/common/cynara_test_commons.cpp
+++ b/src/cynara-tests/common/cynara_test_commons.cpp
@@ -30,7 +30,7 @@ const std::string SOCKET_CLIENT("cynara.socket");
 const std::string SOCKET_ADMIN("cynara-admin.socket");
 const std::string SOCKET_AGENT("cynara-agent.socket");
 
-const std::string SERVICE_PLUGINS_DIR("/usr/lib/cynara/plugin/service/");
+const std::string SERVICE_PLUGINS_DIR(LIB_DIR"/cynara/plugin/service/");
 
 }
 

diff --git a/src/security-manager-tests/common/app_install_helper_ext.cpp b/src/security-manager-tests/common/app_install_helper_ext.cpp
index 878dfc18da3f371d64d5862c7f61ff503163e7d0..da8ae9948fc74b2ec7b8966ae08f29e0c3774cdf 100644 (file)
--- a/src/security-manager-tests/common/app_install_helper_ext.cpp
+++ b/src/security-manager-tests/common/app_install_helper_ext.cpp
@@ -251,7 +251,7 @@ void AppInstallHelperExt::checkSmackAccesses(std::vector<AccessRequest> rules, b
 
 void AppInstallHelperExt::checkPkgSmackRulesAfterUninstall() const
 {
-    const std::vector<AccessRequest> rules(std::move(parseSmackRulesFile(SMACK_RULES_PATH)));
+    const std::vector<AccessRequest> rules(parseSmackRulesFile(SMACK_RULES_PATH));
     const std::string labels[] = {generatePathRWLabel(m_pkgName),
                                   generatePathROLabel(m_pkgName),
                                   generateProcessLabel(m_appName, m_pkgName, true),