event: implement quit handlers

[elogind.git] / src / core / socket.c

diff --git a/src/core/socket.c b/src/core/socket.c
index 6c0ac1a89864fefebff852f8e16de8990f434dda..9a20b5c326c2ca7c25ba79607e610047de5aa51c 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -50,6 +50,7 @@
 #include "label.h"
 #include "exit-status.h"
 #include "def.h"
+#include "smack-util.h"
 
 static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
         [SOCKET_DEAD] = UNIT_INACTIVE,
@@ -775,12 +776,12 @@ static void socket_apply_socket_options(Socket *s, int fd) {
         }
 
 #ifdef HAVE_SMACK
-        if (s->smack_ip_in)
+        if (s->smack_ip_in && use_smack())
                 if (fsetxattr(fd, "security.SMACK64IPIN", s->smack_ip_in, strlen(s->smack_ip_in), 0) < 0)
                         log_error_unit(UNIT(s)->id,
                                        "fsetxattr(\"security.SMACK64IPIN\"): %m");
 
-        if (s->smack_ip_out)
+        if (s->smack_ip_out && use_smack())
                 if (fsetxattr(fd, "security.SMACK64IPOUT", s->smack_ip_out, strlen(s->smack_ip_out), 0) < 0)
                         log_error_unit(UNIT(s)->id,
                                        "fsetxattr(\"security.SMACK64IPOUT\"): %m");
@@ -797,7 +798,7 @@ static void socket_apply_fifo_options(Socket *s, int fd) {
                                          "F_SETPIPE_SZ: %m");
 
 #ifdef HAVE_SMACK
-        if (s->smack)
+        if (s->smack && use_smack())
                 if (fsetxattr(fd, "security.SMACK64", s->smack, strlen(s->smack), 0) < 0)
                         log_error_unit(UNIT(s)->id,
                                        "fsetxattr(\"security.SMACK64\"): %m");