From f3bf30f7d322b2c0634aad8018a2cf65434e090e Mon Sep 17 00:00:00 2001 From: brianjjones Date: Fri, 29 Mar 2013 12:20:28 -0700 Subject: [PATCH] Check if SMACK is enabled, if not skip code so cookie creation doesn't fail --- src/security-srv/server/security-server-cookie.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/security-srv/server/security-server-cookie.c b/src/security-srv/server/security-server-cookie.c index 518134b..04dafbb 100644 --- a/src/security-srv/server/security-server-cookie.c +++ b/src/security-srv/server/security-server-cookie.c @@ -487,6 +487,7 @@ out_of_while: goto error; } +#ifdef SMACK_ENABLED /* Check SMACK label */ ret = smack_new_label_from_socket(sockfd, &smack_label); if (ret != 0) @@ -496,6 +497,7 @@ out_of_while: added = NULL; goto error; } +#endif added->path_len = strlen(cmdline); added->path = calloc(1, strlen(cmdline)); @@ -504,7 +506,9 @@ out_of_while: added->permission_len = perm_num; added->pid = pid; added->permissions = permissions; +#ifdef SMACK_ENABLED added->smack_label = smack_label; +#endif added->prev = current; current->next = added; added->next = NULL; -- 2.7.4