daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
36e8a3
From 8618ef2fb30b4139c9bec4e45fb499cd8192a87f Mon Sep 17 00:00:00 2001
36e8a3
From: Michal Sekletar <msekleta@redhat.com>
36e8a3
Date: Thu, 9 Aug 2018 23:23:00 +0200
36e8a3
Subject: [PATCH] journal: remove journal audit socket
36e8a3
36e8a3
Resolves: #1614554
36e8a3
---
36e8a3
 units/meson.build                   |  2 --
36e8a3
 units/systemd-journald-audit.socket | 22 ----------------------
36e8a3
 units/systemd-journald.service.in   |  4 ++--
36e8a3
 3 files changed, 2 insertions(+), 26 deletions(-)
36e8a3
 delete mode 100644 units/systemd-journald-audit.socket
36e8a3
36e8a3
diff --git a/units/meson.build b/units/meson.build
4bff0a
index e4ac6ced64..e54a84ccbf 100644
36e8a3
--- a/units/meson.build
36e8a3
+++ b/units/meson.build
36e8a3
@@ -89,8 +89,6 @@ units = [
36e8a3
          'sockets.target.wants/'],
36e8a3
         ['systemd-journal-gatewayd.socket',     'ENABLE_REMOTE HAVE_MICROHTTPD'],
36e8a3
         ['systemd-journal-remote.socket',       'ENABLE_REMOTE HAVE_MICROHTTPD'],
36e8a3
-        ['systemd-journald-audit.socket',       '',
36e8a3
-         'sockets.target.wants/'],
36e8a3
         ['systemd-journald-dev-log.socket',     '',
36e8a3
          'sockets.target.wants/'],
36e8a3
         ['systemd-journald.socket',             '',
36e8a3
diff --git a/units/systemd-journald-audit.socket b/units/systemd-journald-audit.socket
36e8a3
deleted file mode 100644
4bff0a
index cb8b774963..0000000000
36e8a3
--- a/units/systemd-journald-audit.socket
36e8a3
+++ /dev/null
36e8a3
@@ -1,22 +0,0 @@
36e8a3
-#  SPDX-License-Identifier: LGPL-2.1+
36e8a3
-#
36e8a3
-#  This file is part of systemd.
36e8a3
-#
36e8a3
-#  systemd is free software; you can redistribute it and/or modify it
36e8a3
-#  under the terms of the GNU Lesser General Public License as published by
36e8a3
-#  the Free Software Foundation; either version 2.1 of the License, or
36e8a3
-#  (at your option) any later version.
36e8a3
-
36e8a3
-[Unit]
36e8a3
-Description=Journal Audit Socket
36e8a3
-Documentation=man:systemd-journald.service(8) man:journald.conf(5)
36e8a3
-DefaultDependencies=no
36e8a3
-Before=sockets.target
36e8a3
-ConditionSecurity=audit
36e8a3
-ConditionCapability=CAP_AUDIT_READ
36e8a3
-
36e8a3
-[Socket]
36e8a3
-Service=systemd-journald.service
36e8a3
-ReceiveBuffer=128M
36e8a3
-ListenNetlink=audit 1
36e8a3
-PassCredentials=yes
36e8a3
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
4bff0a
index 52939e6820..8f5021d0de 100644
36e8a3
--- a/units/systemd-journald.service.in
36e8a3
+++ b/units/systemd-journald.service.in
36e8a3
@@ -12,12 +12,12 @@ Description=Journal Service
36e8a3
 Documentation=man:systemd-journald.service(8) man:journald.conf(5)
36e8a3
 DefaultDependencies=no
36e8a3
 Requires=systemd-journald.socket
36e8a3
-After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket syslog.socket
36e8a3
+After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket
36e8a3
 Before=sysinit.target
36e8a3
 
36e8a3
 [Service]
36e8a3
 Type=notify
36e8a3
-Sockets=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket
36e8a3
+Sockets=systemd-journald.socket systemd-journald-dev-log.socket
36e8a3
 ExecStart=@rootlibexecdir@/systemd-journald
36e8a3
 Restart=always
36e8a3
 RestartSec=0