summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-16 13:20:38 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-16 13:20:38 +0200
commit45c196a76b2d883552c90807386d9bed40da822b (patch)
tree595514fc45ddf58af414f8b6ae68a5c5268b1e68
parenta01647e53727107d82382bc5c9d98c894e8f386c (diff)
tmpfiles: set up selinux label proeprly when creating fifos
-rw-r--r--src/shared/util.c1
-rw-r--r--src/tmpfiles/tmpfiles.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/shared/util.c b/src/shared/util.c
index a7aec5c54f..d93a9680fd 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -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);
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index df52085ff4..0fd2bd233a 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -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);