From: Krzysztof Jackiewicz <k.jackiewicz@samsung.com>
Date: Mon, 4 Mar 2019 09:13:17 +0000 (+0100)
Subject: Merge branches 'ckm', 'security-manager' and 'cynara' into 'tizen'
X-Git-Tag: security-manager_5.5_testing~7
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Ftest%2Fsecurity-tests.git;a=commitdiff_plain;h=99ac53ca4f1ef7a2b931711969c08a4acee06fad

Merge branches 'ckm', 'security-manager' and 'cynara' into 'tizen'

This merge is necessary to introduce common changes to onlycap handling in a
following commit.

Change-Id: I78a26f9d4820067fca2f0bcc2ab7ce96f5d4e4e4
---

99ac53ca4f1ef7a2b931711969c08a4acee06fad
diff --cc packaging/security-tests.spec
index 9208e72,47f0c7a,f96f79b,2dfcfe4..4652696
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@@@ -70,9 -73,11 -71,8 -73,8 +78,9 @@@@@ id -u  security_test_user 1>/dev/null 2
    %install
    %make_install
    ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk
 +++cp -a %{SOURCE1} %{buildroot}%{_datadir}/
    
    %post
 -  id -u  security_test_user 1>/dev/null 2>&1 || \
 -      gum-utils -o -a --username=security_test_user --usertype=normal
 -  
    # Reload dbus daemon to apply newly installed configuration
    systemctl reload dbus
    
diff --cc src/common/CMakeLists.txt
index caccd72,4fd8953,dc9aeeb,b75ce1b..9d00f36
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@@@@ -12,7 -11,6 -12,8 -12,8 +12,9 @@@@@ PKG_CHECK_MODULES(COMMON_TARGET_DE
        cynara-creds-socket
        cynara-creds-dbus
        cynara-creds-gdbus
+++     cynara-creds-sd-bus
 +      security-manager
++ +    security-privilege-manager
        REQUIRED
        )
    
@@@@@ -35,15 -33,6 -36,16 -36,15 +37,16 @@@@@ SET(COMMON_TARGET_TEST_SOURCE
        ${PROJECT_SOURCE_DIR}/src/common/timeout.cpp
        ${PROJECT_SOURCE_DIR}/src/common/temp_test_user.cpp
        ${PROJECT_SOURCE_DIR}/src/common/cynara_helpers_creds.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/label_generator.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/app_install_helper.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_api.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_label_monitor.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_request.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_sharing_request.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_user_request.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_policy_request.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/tzplatform.cpp
++ +    ${PROJECT_SOURCE_DIR}/src/common/privilege_manager.cpp
        )
    
    #system and local includes