Enabling compilation under GCC-4.8.

[Issue#]   N/A
[Bug]      Build break.
[Problem]  Lack of header files.
           Space is required between strings that will be concatenated.
           Remove compilation warning.
[Solution] N/A

[Verification] Build. Run tests.

Change-Id: I7c34508a17ccd539d987d887a530959b3f257b87

diff --git a/src/communication/security-server-comm.c b/src/communication/security-server-comm.c
index c16656f..5ad8058 100644 (file)
--- a/src/communication/security-server-comm.c
+++ b/src/communication/security-server-comm.c
@@ -150,11 +150,12 @@ int check_socket_poll(int sockfd, int event, int timeout)
 int safe_server_sock_close(int client_sockfd)
 {
     struct pollfd poll_fd[1];
-    int retval;
-    retval = SECURITY_SERVER_ERROR_POLL;
     poll_fd[0].fd = client_sockfd;
     poll_fd[0].events = POLLRDHUP;
-    retval = poll(poll_fd, 1, SECURITY_SERVER_SOCKET_TIMEOUT_MILISECOND);
+    if (0 > poll(poll_fd, 1, SECURITY_SERVER_SOCKET_TIMEOUT_MILISECOND)) {
+        SECURE_SLOGE("%s", "Unable to poll from socket");
+        return SECURITY_SERVER_ERROR_SOCKET;
+    }
     SEC_SVR_DBG("%s", "Server: Closing server socket");
     close(client_sockfd);
     return SECURITY_SERVER_SUCCESS;

diff --git a/src/include/security-server-common.h b/src/include/security-server-common.h
index 0e2f2f8..f5dc2ca 100644 (file)
--- a/src/include/security-server-common.h
+++ b/src/include/security-server-common.h
@@ -142,11 +142,11 @@ void printhex(const unsigned char *data, int size);
 
 /* Debug */
 #ifdef SECURITY_SERVER_DEBUG_TO_CONSOLE /* debug msg will be printed in console */
-#define SEC_SVR_DBG(FMT, ARG ...) fprintf(stderr, "[DBG:%s:%d] "FMT"\n", \
+#define SEC_SVR_DBG(FMT, ARG ...) fprintf(stderr, "[DBG:%s:%d] " FMT "\n", \
                 __FILE__, __LINE__, ##ARG)
-#define SEC_SVR_WRN(FMT, ARG ...) fprintf(stderr, "[WRN:%s:%d] "FMT"\n", \
+#define SEC_SVR_WRN(FMT, ARG ...) fprintf(stderr, "[WRN:%s:%d] " FMT "\n", \
                 __FILE__, __LINE__, ##ARG)
-#define SEC_SVR_ERR(FMT, ARG ...) fprintf(stderr, "[ERR:%s:%d] "FMT"\n", \
+#define SEC_SVR_ERR(FMT, ARG ...) fprintf(stderr, "[ERR:%s:%d] " FMT "\n", \
                 __FILE__, __LINE__, ##ARG)
 
 #else

diff --git a/src/server2/service/get-gid.cpp b/src/server2/service/get-gid.cpp
index abe5cd6..5630792 100644 (file)
--- a/src/server2/service/get-gid.cpp
+++ b/src/server2/service/get-gid.cpp
@@ -22,6 +22,7 @@
  * @brief       Implementation of api-get-gid service.
  */
 
+#include <unistd.h>
 #include <sys/smack.h>
 #include <grp.h>
 #include <unistd.h>