X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fsmack-setup.c;h=611bfdb2df155b20e51bf84ff95a478246c50ec9;hp=d67a84a583308362b80fe469e098b729c215206b;hb=92c1622e14dd99890928b1a1596e4a670b31a7ff;hpb=2b3e18de74ca89b374dd4f7a2c30e5731d347841

diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index d67a84a58..611bfdb2d 100644
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -36,11 +36,12 @@
 #include "macro.h"
 #include "smack-setup.h"
 #include "util.h"
+#include "fileio.h"
 #include "log.h"
 #include "label.h"
 
 #define SMACK_CONFIG "/etc/smack/accesses.d/"
-#define CIPSO_CONFIG "/etc/smack/cipso/"
+#define CIPSO_CONFIG "/etc/smack/cipso.d/"
 
 #ifdef HAVE_SMACK
 
@@ -138,6 +139,13 @@ int smack_setup(void) {
                 return 0;
         }
 
+#ifdef SMACK_RUN_LABEL
+        r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL);
+        if (r)
+                log_warning("Failed to set SMACK label \"%s\" on self: %s",
+                            SMACK_RUN_LABEL, strerror(-r));
+#endif
+
         r = write_rules("/sys/fs/smackfs/cipso2", CIPSO_CONFIG);
         switch(r) {
         case -ENOENT: