X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fsocket.c;h=345601f0aed052efd70458e2a5712caba1cac801;hp=6c0ac1a89864fefebff852f8e16de8990f434dda;hb=d682b3a7e7c7c2941a4d3e193f1e330dbc9fae89;hpb=0581dac2c146cef0f55841a4c136dc48409c8eaa

diff --git a/src/core/socket.c b/src/core/socket.c
index 6c0ac1a89..345601f0a 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -775,12 +775,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 +797,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");