Fix setting of socket directory

Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80a68aa..ce870ab 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ add_definitions(-DCYNARA_VERSION="${CYNARA_VERSION}")
 set(SYSTEMD ON CACHE BOOL "should use systemd")
 set(DEFAULT_DB_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/cynara"
        CACHE PATH "directory path of the database")
-set(DEFAULT_SOCKET_DIR "${CMAKE_INSTALL_FULL_RUNSTATEDIR}"
+set(DEFAULT_SOCKET_DIR "${CMAKE_INSTALL_FULL_RUNSTATEDIR}/cynara"
        CACHE PATH "directory path of the sockets")
 set(DEFAULT_CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/security"
        CACHE PATH "directory of configuration")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b09a89..4aa6853 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,8 +51,7 @@ add_compile_definitions(_GNU_SOURCE)
 ###########################################
 ADD_LIBRARY(cynara SHARED ${LIB_SOURCES})
 target_compile_definitions(cynara PRIVATE
-       RCYN_DEFAULT_CHECK_SOCKET_SPEC="unix:${DEFAULT_SOCKET_DIR}/cynara.check"
-       RCYN_DEFAULT_ADMIN_SOCKET_SPEC="unix:${DEFAULT_SOCKET_DIR}/cynara.admin"
+       RCYN_DEFAULT_SOCKET_DIR="${DEFAULT_SOCKET_DIR}"
 )
 SET_TARGET_PROPERTIES(cynara PROPERTIES
        VERSION ${CYNARA_VERSION}
@@ -73,8 +72,7 @@ target_compile_definitions(cynarad PRIVATE
        DEFAULT_DB_DIR="${DEFAULT_DB_DIR}"
        DEFAULT_SOCKET_DIR="${DEFAULT_SOCKET_DIR}"
        DEFAULT_INIT_FILE="${DEFAULT_INIT_FILE}"
-       RCYN_DEFAULT_CHECK_SOCKET_SPEC="unix:${DEFAULT_SOCKET_DIR}/cynara.check"
-       RCYN_DEFAULT_ADMIN_SOCKET_SPEC="unix:${DEFAULT_SOCKET_DIR}/cynara.admin"
+       RCYN_DEFAULT_SOCKET_DIR="${DEFAULT_SOCKET_DIR}"
 )
 target_link_libraries(cynarad cap)
 install(TARGETS cynarad