Adapt security-server for a new libsmack API

    [Issue#]   SSDWSSP-433
    [Bug]      N/A
    [Cause]    Changed API of libsmack.
    [Problem]  Function smack_new_label_from_socket() is now returning value greater than 0 on success, not 0 as it was before.
    [Solution] Changes of expected function results
    [Verification] Run tests.

Change-Id: I89aa91e69fccb0091dfb1eccd2fc2d6347cfcf3b

diff --git a/src/server/security-server-cookie.c b/src/server/security-server-cookie.c
index e9aefe8..4b82863 100644 (file)
--- a/src/server/security-server-cookie.c
+++ b/src/server/security-server-cookie.c
@@ -459,7 +459,7 @@ out_of_while:
     if (smack_check())
     {
         ret = smack_new_label_from_socket(sockfd, &smack_label);
-        if (ret != 0)
+        if (ret < 0)
         {
             SEC_SVR_ERR("Error checking peer label: %d", ret);
             free(added);

diff --git a/src/server2/client/client-socket-privilege.cpp b/src/server2/client/client-socket-privilege.cpp
index 1ce4f32..d7d1e5e 100644 (file)
--- a/src/server2/client/client-socket-privilege.cpp
+++ b/src/server2/client/client-socket-privilege.cpp
@@ -95,7 +95,7 @@ int security_server_check_privilege_by_sockfd(int sockfd,
         return SECURITY_SERVER_API_ERROR_INPUT_PARAM;
 
     ret = smack_new_label_from_socket(sockfd, &subject);
-    if (ret == 0) {
+    if (ret >= 0) {
         subjectPtr.reset(subject);
         subject = NULL;
     } else {
@@ -149,7 +149,7 @@ char *security_server_get_smacklabel_sockfd(int fd)
         return label;
     }
 
-    if (smack_new_label_from_socket(fd, &label) != 0)
+    if (smack_new_label_from_socket(fd, &label) < 0)
     {
         LogError("Client ERROR: Unable to get socket SMACK label");
         return NULL;

diff --git a/src/util/security-server-util-common.c b/src/util/security-server-util-common.c
index 766949b..0d95f60 100644 (file)
--- a/src/util/security-server-util-common.c
+++ b/src/util/security-server-util-common.c
@@ -469,7 +469,7 @@ int authorize_SS_API_caller_socket(int sockfd, char *required_API_label, char *r
     }
 
     retval = smack_new_label_from_socket(sockfd, &label);
-    if (retval != 0) {
+    if (retval < 0) {
         SEC_SVR_ERR("%s", "Error in getting label from socket");
         retval = -1;
         goto end;