From: Sebastian Grabowski Date: Mon, 27 Oct 2014 09:47:05 +0000 (+0100) Subject: Move some modules to common library X-Git-Tag: accepted/tizen/common/20141121.095621~3 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fsecurity%2Fsecurity-manager.git;a=commitdiff_plain;h=8f29087139f303c74787fd7cc1f5fe314d79a438 Move some modules to common library There are modules for handling smack, cynara, privilege db that were grouped in server code. However, there are upcoming changes (for offline mode) that will require these modules to be used also i.e. by client code. Thus it would be better to have these modules in common library. Change-Id: Ifddd037a159dc142077290c09b7e05da98ce46e5 Signed-off-by: Sebastian Grabowski --- diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec index a5d904f..d3fa093 100644 --- a/packaging/security-manager.spec +++ b/packaging/security-manager.spec @@ -11,7 +11,6 @@ Requires(post): smack BuildRequires: cmake BuildRequires: zip BuildRequires: libattr-devel -BuildRequires: libcap-devel BuildRequires: pkgconfig(libsmack) BuildRequires: pkgconfig(libcap) BuildRequires: pkgconfig(libsystemd-daemon) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index f2dbde4..18226b8 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -4,6 +4,10 @@ SET(COMMON_VERSION ${COMMON_VERSION_MAJOR}.1.0) PKG_CHECK_MODULES(COMMON_DEP REQUIRED libsystemd-journal + libsmack + db-util + cynara-admin + cynara-client ) INCLUDE_DIRECTORIES(SYSTEM @@ -11,15 +15,14 @@ INCLUDE_DIRECTORIES(SYSTEM ) INCLUDE_DIRECTORIES( + ${INCLUDE_PATH} ${COMMON_PATH}/include ${DPL_PATH}/core/include ${DPL_PATH}/log/include + ${DPL_PATH}/db/include ) SET(COMMON_SOURCES - ${COMMON_PATH}/protocols.cpp - ${COMMON_PATH}/message-buffer.cpp - ${COMMON_PATH}/smack-common.cpp ${DPL_PATH}/log/src/abstract_log_provider.cpp ${DPL_PATH}/log/src/sd_journal_provider.cpp ${DPL_PATH}/log/src/log.cpp @@ -31,6 +34,18 @@ SET(COMMON_SOURCES ${DPL_PATH}/core/src/noncopyable.cpp ${DPL_PATH}/core/src/serialization.cpp ${DPL_PATH}/core/src/singleton.cpp + ${DPL_PATH}/core/src/errno_string.cpp + ${DPL_PATH}/core/src/string.cpp + ${DPL_PATH}/db/src/naive_synchronization_object.cpp + ${DPL_PATH}/db/src/sql_connection.cpp + ${COMMON_PATH}/cynara.cpp + ${COMMON_PATH}/protocols.cpp + ${COMMON_PATH}/message-buffer.cpp + ${COMMON_PATH}/privilege_db.cpp + ${COMMON_PATH}/smack-common.cpp + ${COMMON_PATH}/smack-labels.cpp + ${COMMON_PATH}/smack-rules.cpp + ${COMMON_PATH}/smack-check.cpp ) ADD_LIBRARY(${TARGET_COMMON} SHARED ${COMMON_SOURCES}) diff --git a/src/server/service/cynara.cpp b/src/common/cynara.cpp similarity index 100% rename from src/server/service/cynara.cpp rename to src/common/cynara.cpp diff --git a/src/server/service/include/cynara.h b/src/common/include/cynara.h similarity index 100% rename from src/server/service/include/cynara.h rename to src/common/include/cynara.h diff --git a/src/server/db/include/privilege_db.h b/src/common/include/privilege_db.h similarity index 100% rename from src/server/db/include/privilege_db.h rename to src/common/include/privilege_db.h diff --git a/src/server/include/smack-check.h b/src/common/include/smack-check.h similarity index 100% rename from src/server/include/smack-check.h rename to src/common/include/smack-check.h diff --git a/src/server/service/include/smack-labels.h b/src/common/include/smack-labels.h similarity index 100% rename from src/server/service/include/smack-labels.h rename to src/common/include/smack-labels.h diff --git a/src/server/service/include/smack-rules.h b/src/common/include/smack-rules.h similarity index 100% rename from src/server/service/include/smack-rules.h rename to src/common/include/smack-rules.h diff --git a/src/server/db/privilege_db.cpp b/src/common/privilege_db.cpp similarity index 100% rename from src/server/db/privilege_db.cpp rename to src/common/privilege_db.cpp diff --git a/src/server/smack-check.cpp b/src/common/smack-check.cpp similarity index 100% rename from src/server/smack-check.cpp rename to src/common/smack-check.cpp diff --git a/src/server/service/smack-labels.cpp b/src/common/smack-labels.cpp similarity index 100% rename from src/server/service/smack-labels.cpp rename to src/common/smack-labels.cpp diff --git a/src/server/service/smack-rules.cpp b/src/common/smack-rules.cpp similarity index 100% rename from src/server/service/smack-rules.cpp rename to src/common/smack-rules.cpp diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 914902f..6117a17 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -1,12 +1,6 @@ PKG_CHECK_MODULES(SERVER_DEP REQUIRED - libcap - libsmack libsystemd-daemon - libtzplatform-config - sqlite3 - db-util - cynara-admin cynara-client ) @@ -22,29 +16,18 @@ INCLUDE_DIRECTORIES(SYSTEM INCLUDE_DIRECTORIES( ${INCLUDE_PATH} ${COMMON_PATH}/include - ${SERVER_PATH}/include ${SERVER_PATH}/main/include ${SERVER_PATH}/service/include - ${SERVER_PATH}/db/include ${DPL_PATH}/core/include ${DPL_PATH}/log/include ${DPL_PATH}/db/include ) SET(SERVER_SOURCES - ${SERVER_PATH}/smack-check.cpp ${SERVER_PATH}/main/generic-socket-manager.cpp ${SERVER_PATH}/main/socket-manager.cpp ${SERVER_PATH}/main/server-main.cpp ${SERVER_PATH}/service/service.cpp - ${SERVER_PATH}/service/smack-rules.cpp - ${SERVER_PATH}/service/smack-labels.cpp - ${SERVER_PATH}/service/cynara.cpp - ${SERVER_PATH}/db/privilege_db.cpp - ${DPL_PATH}/core/src/errno_string.cpp - ${DPL_PATH}/core/src/string.cpp - ${DPL_PATH}/db/src/naive_synchronization_object.cpp - ${DPL_PATH}/db/src/sql_connection.cpp ) ADD_EXECUTABLE(${TARGET_SERVER} ${SERVER_SOURCES})