chiark / gitweb /
tmpfiles: set up selinux label proeprly when creating fifos
authorLennart Poettering <lennart@poettering.net>
Mon, 16 Jun 2014 11:20:38 +0000 (13:20 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 16 Jun 2014 11:20:38 +0000 (13:20 +0200)
src/shared/util.c
src/tmpfiles/tmpfiles.c

index a7aec5c54f53114b991084277055901e77f74a96..d93a9680fde3890ad26a3dc808063e211d556ceb 100644 (file)
@@ -6659,6 +6659,7 @@ int bind_remount_recursive(const char *prefix, bool ro) {
 }
 
 int fflush_and_check(FILE *f) {
+        assert(f);
 
         errno = 0;
         fflush(f);
index df52085ff4f7aa49eee3304f70a0ef3bf730c5cb..0fd2bd233af5801b7c67bc108fbc666b0ee1b0e1 100644 (file)
@@ -719,9 +719,11 @@ static int create_item(Item *i) {
 
         case CREATE_FIFO:
 
+                label_context_set(i->path, S_IFIFO);
                 RUN_WITH_UMASK(0000) {
                         r = mkfifo(i->path, i->mode);
                 }
+                label_context_clear();
 
                 if (r < 0 && errno != EEXIST) {
                         log_error("Failed to create fifo %s: %m", i->path);