anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0127-journal-remove-audit-socket-unit-files.patch

803fb7
From c45af40e61ab34508862f9e668f47cc6eb2f6d45 Mon Sep 17 00:00:00 2001
803fb7
From: Lukas Nykryn <lnykryn@redhat.com>
803fb7
Date: Thu, 16 Apr 2015 10:50:10 +0200
803fb7
Subject: [PATCH] journal: remove audit socket unit-files
803fb7
803fb7
---
803fb7
 Makefile.am                         |  6 ++----
803fb7
 units/systemd-journald-audit.socket | 19 -------------------
803fb7
 units/systemd-journald.service.in   |  4 ++--
803fb7
 3 files changed, 4 insertions(+), 25 deletions(-)
803fb7
 delete mode 100644 units/systemd-journald-audit.socket
803fb7
803fb7
diff --git a/Makefile.am b/Makefile.am
803fb7
index bec32c39e..6d6b650f2 100644
803fb7
--- a/Makefile.am
803fb7
+++ b/Makefile.am
803fb7
@@ -4518,8 +4518,7 @@ bin_PROGRAMS += \
803fb7
 
803fb7
 dist_systemunit_DATA += \
803fb7
 	units/systemd-journald.socket \
803fb7
-	units/systemd-journald-dev-log.socket \
803fb7
-	units/systemd-journald-audit.socket
803fb7
+	units/systemd-journald-dev-log.socket
803fb7
 
803fb7
 nodist_systemunit_DATA += \
803fb7
 	units/systemd-journald.service \
803fb7
@@ -4539,8 +4538,7 @@ dist_catalog_DATA = \
803fb7
 
803fb7
 SOCKETS_TARGET_WANTS += \
803fb7
 	systemd-journald.socket \
803fb7
-	systemd-journald-dev-log.socket \
803fb7
-	systemd-journald-audit.socket
803fb7
+	systemd-journald-dev-log.socket
803fb7
 
803fb7
 SYSINIT_TARGET_WANTS += \
803fb7
 	systemd-journald.service \
803fb7
diff --git a/units/systemd-journald-audit.socket b/units/systemd-journald-audit.socket
803fb7
deleted file mode 100644
803fb7
index 35397aaeb..000000000
803fb7
--- a/units/systemd-journald-audit.socket
803fb7
+++ /dev/null
803fb7
@@ -1,19 +0,0 @@
803fb7
-#  This file is part of systemd.
803fb7
-#
803fb7
-#  systemd is free software; you can redistribute it and/or modify it
803fb7
-#  under the terms of the GNU Lesser General Public License as published by
803fb7
-#  the Free Software Foundation; either version 2.1 of the License, or
803fb7
-#  (at your option) any later version.
803fb7
-
803fb7
-[Unit]
803fb7
-Description=Journal Audit Socket
803fb7
-Documentation=man:systemd-journald.service(8) man:journald.conf(5)
803fb7
-DefaultDependencies=no
803fb7
-Before=sockets.target
803fb7
-ConditionSecurity=audit
803fb7
-
803fb7
-[Socket]
803fb7
-Service=systemd-journald.service
803fb7
-ReceiveBuffer=128M
803fb7
-ListenNetlink=audit 1
803fb7
-PassCredentials=yes
803fb7
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
803fb7
index 87704bb9c..1bcc290ec 100644
803fb7
--- a/units/systemd-journald.service.in
803fb7
+++ b/units/systemd-journald.service.in
803fb7
@@ -10,12 +10,12 @@ Description=Journal Service
803fb7
 Documentation=man:systemd-journald.service(8) man:journald.conf(5)
803fb7
 DefaultDependencies=no
803fb7
 Requires=systemd-journald.socket
803fb7
-After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket syslog.socket
803fb7
+After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket
803fb7
 Before=sysinit.target
803fb7
 
803fb7
 [Service]
803fb7
 Type=notify
803fb7
-Sockets=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket
803fb7
+Sockets=systemd-journald.socket systemd-journald-dev-log.socket
803fb7
 ExecStart=@rootlibexecdir@/systemd-journald
803fb7
 Restart=always
803fb7
 RestartSec=0