daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
4bff0a
From 7a650ee8d3faf79fd5ef866b69741880a3a42b8d Mon Sep 17 00:00:00 2001
4bff0a
From: Jan Synacek <jsynacek@redhat.com>
4bff0a
Date: Thu, 2 May 2019 14:11:54 +0200
4bff0a
Subject: [PATCH] journal: don't enable systemd-journald-audit.socket by
4bff0a
 default
4bff0a
4bff0a
Resolves: #1699287
4bff0a
---
4bff0a
 units/meson.build                 | 3 +--
4bff0a
 units/systemd-journald.service.in | 2 +-
4bff0a
 2 files changed, 2 insertions(+), 3 deletions(-)
4bff0a
4bff0a
diff --git a/units/meson.build b/units/meson.build
4bff0a
index e4ac6ced64..e118d81888 100644
4bff0a
--- a/units/meson.build
4bff0a
+++ b/units/meson.build
4bff0a
@@ -89,8 +89,7 @@ units = [
4bff0a
          'sockets.target.wants/'],
4bff0a
         ['systemd-journal-gatewayd.socket',     'ENABLE_REMOTE HAVE_MICROHTTPD'],
4bff0a
         ['systemd-journal-remote.socket',       'ENABLE_REMOTE HAVE_MICROHTTPD'],
4bff0a
-        ['systemd-journald-audit.socket',       '',
4bff0a
-         'sockets.target.wants/'],
4bff0a
+        ['systemd-journald-audit.socket',       ''],
4bff0a
         ['systemd-journald-dev-log.socket',     '',
4bff0a
          'sockets.target.wants/'],
4bff0a
         ['systemd-journald.socket',             '',
4bff0a
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
4bff0a
index 4eab2fa841..e109b25792 100644
4bff0a
--- a/units/systemd-journald.service.in
4bff0a
+++ b/units/systemd-journald.service.in
4bff0a
@@ -17,7 +17,7 @@ Before=sysinit.target
4bff0a
 
4bff0a
 [Service]
4bff0a
 Type=notify
4bff0a
-Sockets=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket
4bff0a
+Sockets=systemd-journald.socket systemd-journald-dev-log.socket
4bff0a
 ExecStart=@rootlibexecdir@/systemd-journald
4bff0a
 Restart=always
4bff0a
 RestartSec=0