summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-01-17 23:27:39 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-01-22 01:14:53 -0500
commitf8eeeaf9b783ebbab30672629abf3920db286811 (patch)
treedde9bca6dd3cf7ad995f1434edbd760e31a44934 /src/journal
parent3f93da987961c139215d3a55fd25496310537d1b (diff)
tmpfiles: add 'a' type to set ACLs
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/coredump.c6
-rw-r--r--src/journal/journalctl.c6
-rw-r--r--src/journal/journald-server.c5
3 files changed, 2 insertions, 15 deletions
diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index a37e5eb8a7..d322e7984c 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -49,11 +49,7 @@
#include "path-util.h"
#include "compress.h"
#include "coredump-vacuum.h"
-
-#ifdef HAVE_ACL
-# include <sys/acl.h>
-# include "acl-util.h"
-#endif
+#include "acl-util.h"
/* The maximum size up to which we process coredumps */
#define PROCESS_SIZE_MAX ((off_t) (2LLU*1024LLU*1024LLU*1024LLU))
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 27a6187e50..c17cf55c30 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -37,17 +37,13 @@
#include <sys/inotify.h>
#include <linux/fs.h>
-#ifdef HAVE_ACL
-#include <sys/acl.h>
-#include "acl-util.h"
-#endif
-
#include "sd-journal.h"
#include "sd-bus.h"
#include "log.h"
#include "logs-show.h"
#include "util.h"
+#include "acl-util.h"
#include "path-util.h"
#include "fileio.h"
#include "build.h"
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 5999724edc..87b459b3ca 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -52,12 +52,7 @@
#include "journald-native.h"
#include "journald-audit.h"
#include "journald-server.h"
-
-#ifdef HAVE_ACL
-#include <sys/acl.h>
-#include <acl/libacl.h>
#include "acl-util.h"
-#endif
#ifdef HAVE_SELINUX
#include <selinux/selinux.h>