fix build in x86_64

Change-Id: I294e913ab5f2d481e9c7187ec5885b92a7eb8424
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 0fad22046e4e86b8b9f0100dcdeef680254eb9b6..2cd61771a20cf8da5f1a662cd3b0de956c9d868c 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -49,5 +49,5 @@ TARGET_LINK_LIBRARIES(${TARGET_SERVER_COMMON}
 
 ################################################################################
 
-INSTALL(TARGETS ${TARGET_SERVER_COMMON} DESTINATION lib)
+INSTALL(TARGETS ${TARGET_SERVER_COMMON} DESTINATION ${LIB_INSTALL_DIR})
 

diff --git a/src/server/client/client-common.cpp b/src/server/client/client-common.cpp
index 5453db20fc53e62bf2801daadd841cb8f6fee0a6..b032974b7e9fbdac8845644b08063a92a1b476da 100644 (file)
--- a/src/server/client/client-common.cpp
+++ b/src/server/client/client-common.cpp
@@ -121,7 +121,7 @@ public:
                 return SECURITY_SERVER_API_ERROR_SOCKET;
             }
             int error = 0;
-            size_t len = sizeof(error);
+            socklen_t len = sizeof(error);
             retval = getsockopt(m_sock, SOL_SOCKET, SO_ERROR, &error, &len);
 
             if (-1 == retval) {

diff --git a/src/server/client/client-socket-privilege.cpp b/src/server/client/client-socket-privilege.cpp
index 4d90902873978b8e33032f2025c25f610b7eed93..fded5e374e68c2b953df5e0edff846e3b1c89681 100644 (file)
--- a/src/server/client/client-socket-privilege.cpp
+++ b/src/server/client/client-socket-privilege.cpp
@@ -48,7 +48,7 @@ int security_server_check_privilege_by_sockfd(int sockfd,
 
     //for get socket options
     struct ucred cr;
-    size_t len = sizeof(struct ucred);
+    socklen_t len = sizeof(struct ucred);
 
     //SMACK runtime check
     if (!SecurityServer::smack_runtime_check())