Cynara framework is always available

DCM is not used outside Tizen,
we can rely on cynara framework being always available.

Change-Id: Ib5e4bdeccf9a99b1dbfd935e3d5b2f32eae5877f

diff --git a/cmake/CheckFrameworks.cmake b/cmake/CheckFrameworks.cmake
index 9fbea2e..bb3bf54 100644 (file)
--- a/cmake/CheckFrameworks.cmake
+++ b/cmake/CheckFrameworks.cmake
@@ -49,7 +49,3 @@ IF(NOT MBEDTLS_HEADERS_OK)
 ENDIF()
 
 PKG_CHECK_MODULES(SYSTEMD libsystemd)
-
-#### Cynara ####
-
-PKG_CHECK_MODULES(CYNARA cynara-client cynara-creds-socket cynara-session)

diff --git a/dcm-daemon/CMakeLists.txt b/dcm-daemon/CMakeLists.txt
index 9ebfe2b..6993d8d 100644 (file)
--- a/dcm-daemon/CMakeLists.txt
+++ b/dcm-daemon/CMakeLists.txt
@@ -38,12 +38,15 @@ IF(ENABLE_SYSTEMD_SUPPORT)
        add_definitions(-DUSE_SYSTEMD_API=1)
 ENDIF(ENABLE_SYSTEMD_SUPPORT)
 
-IF(CYNARA_FOUND)
-       include_directories(${CYNARA_INCLUDE_DIRS})
-       link_directories(${CYNARA_LIBRARY_DIRS})
-       add_definitions(${CYNARA_CFLAGS_OTHER})
-       add_definitions(-DUSE_CYNARA=1)
-ENDIF(CYNARA_FOUND)
+PKG_CHECK_MODULES(CYNARA
+       REQUIRED
+       cynara-client
+       cynara-creds-socket
+       cynara-session)
+
+INCLUDE_DIRECTORIES(${CYNARA_INCLUDE_DIRS})
+LINK_DIRECTORIES(${CYNARA_LIBRARY_DIRS})
+ADD_DEFINITIONS(${CYNARA_CFLAGS_OTHER})
 
 include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})
@@ -74,6 +77,7 @@ target_link_libraries(device-certificate-managerd
        ${Boost_SYSTEM_LIBRARY}
        ${CMAKE_THREAD_LIBS_INIT}
        ${DLOG_LIBRARIES}
+       ${CYNARA_LIBRARIES}
        device-certificate-manager
        dl)
 
@@ -81,10 +85,6 @@ IF(ENABLE_SYSTEMD_SUPPORT)
        target_link_libraries(device-certificate-managerd ${SYSTEMD_LIBRARIES})
 ENDIF(ENABLE_SYSTEMD_SUPPORT)
 
-IF(CYNARA_FOUND)
-       target_link_libraries(device-certificate-managerd ${CYNARA_LIBRARIES})
-ENDIF(CYNARA_FOUND)
-
 ###### Installation #######
 
 INSTALL(TARGETS device-certificate-managerd

diff --git a/dcm-daemon/dcmsession.cpp b/dcm-daemon/dcmsession.cpp
index 4d04ed4..fa3c3f5 100644 (file)
--- a/dcm-daemon/dcmsession.cpp
+++ b/dcm-daemon/dcmsession.cpp
@@ -28,13 +28,10 @@
 #include <map>
 #include <mutex>
 
-#ifdef USE_CYNARA
 #include <cynara-client.h>
 #include <cynara-creds-socket.h>
 #include <cynara-session.h>
-#endif
 
-#ifdef USE_CYNARA
 extern cynara * gGlobalCynaraInstance;
 
 static inline std::string cynara_error_to_string(int error) {
@@ -44,7 +41,6 @@ static inline std::string cynara_error_to_string(int error) {
                return std::string(buffer);
        return std::string("Can't translate error");
 }
-#endif
 
 unsigned int globalSessionCounter = 0;
 
@@ -75,7 +71,6 @@ struct string_free_deleter {
 
 bool dcm_session::verify_privileges(int handle)
 {
-#ifdef USE_CYNARA
        BOOST_LOG_FUNCTION();
 
        int ret = 0;
@@ -138,9 +133,6 @@ bool dcm_session::verify_privileges(int handle)
        }
 
        BOOST_LOG_SEV(dcm_logger::get(), log_severity::debug) << "Access granted for " << pid;
-#else
-       (void)handle;
-#endif
 
        return true;
 }

diff --git a/dcm-daemon/main.cpp b/dcm-daemon/main.cpp
index a5b1166..595db74 100644 (file)
--- a/dcm-daemon/main.cpp
+++ b/dcm-daemon/main.cpp
@@ -35,9 +35,7 @@
 
 #include <boost_log_dlog_sink.h>
 
-#ifdef USE_CYNARA
 #include <cynara-client.h>
-#endif
 
 BOOST_LOG_ATTRIBUTE_KEYWORD(_scope, "Scope", boost::log::attributes::named_scope::value_type)
 BOOST_LOG_ATTRIBUTE_KEYWORD(_timestamp, "TimeStamp", boost::posix_time::ptime)
@@ -94,9 +92,7 @@ void init_logging()
        boost::log::core::get()->add_thread_attribute("Scope", boost::log::attributes::named_scope());
 }
 
-#ifdef USE_CYNARA
 cynara * gGlobalCynaraInstance;
-#endif
 
 int main()
 {
@@ -113,7 +109,6 @@ int main()
 
        service_adapter serviceAdapter(DCM_UNIX_SOCKET_PATH);
 
-#ifdef USE_CYNARA
        cynara_configuration * cynara_conf = nullptr;
        error = cynara_configuration_create(&cynara_conf);
        if(error != CYNARA_API_SUCCESS) {
@@ -131,7 +126,6 @@ int main()
                serviceAdapter.notify_start_failure(error);
                return EXIT_FAILURE;
        }
-#endif
 
        try {
                boost::asio::io_service io_service;
@@ -182,10 +176,8 @@ int main()
                return EXIT_FAILURE;
        }
 
-#ifdef USE_CYNARA
        cynara_finish(gGlobalCynaraInstance);
        gGlobalCynaraInstance = nullptr;
-#endif
 
        BOOST_LOG_SEV(dcm_logger::get(), log_severity::normal) << "Server terminated";