user-runtime-dir: fix selinux regression
authorAlan Jenkins <alan.christopher.jenkins@gmail.com>
Mon, 3 Sep 2018 10:10:24 +0000 (11:10 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 3 Sep 2018 12:09:21 +0000 (14:09 +0200)
Fix #9993.  When this code was split out to user-runtime-dir, it forgot to
include the call to mac_selinux_init().  So mkdir_label() stopped working.

Fixes: a9f0f5e50104 ("logind: split %t directory creation to a helper
unit")

src/login/user-runtime-dir.c

index 9f2c594..69f95a2 100644 (file)
@@ -10,6 +10,7 @@
 #include "mount-util.h"
 #include "path-util.h"
 #include "rm-rf.h"
+#include "selinux-util.h"
 #include "smack-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
@@ -171,6 +172,12 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
+        r = mac_selinux_init();
+        if (r < 0) {
+                log_error_errno(r, "Could not initialize labelling: %m\n");
+                return EXIT_FAILURE;
+        }
+
         umask(0022);
 
         if (streq(argv[1], "start"))