X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-server.c;h=9709889e4acb07794dfae8adf307aa58d183798e;hb=bf3d3e2bb7ae2d3854be57f28dd1403c8f7e4c3c;hp=52111f75a03ceb808084d0eb1ca2ccd1a3313d3e;hpb=b1389b0d0805392570085acc7cb10eafcf885405;p=elogind.git

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 52111f75a..9709889e4 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -680,7 +680,7 @@ static void dispatch_message_real(
                 }
 
 #ifdef HAVE_SELINUX
-                if (use_selinux()) {
+                if (mac_selinux_use()) {
                         if (label) {
                                 x = alloca(strlen("_SELINUX_CONTEXT=") + label_len + 1);
 
@@ -1221,9 +1221,11 @@ static int dispatch_sigusr1(sd_event_source *es, const struct signalfd_siginfo *
 
         log_info("Received request to flush runtime journal from PID %"PRIu32, si->ssi_pid);
 
-        touch("/run/systemd/journal/flushed");
         server_flush_to_var(s);
         server_sync(s);
+        server_vacuum(s);
+
+        touch("/run/systemd/journal/flushed");
 
         return 0;
 }