richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
4295f9
From 5ce0a9b91add22f2a21f1bc7c0f888307f7e58e8 Mon Sep 17 00:00:00 2001
4295f9
From: rpm-build <rpm-build>
4295f9
Date: Wed, 1 Aug 2018 10:58:28 +0200
4295f9
Subject: [PATCH] logind: set RemoveIPC to false by default
4295f9
4295f9
RHEL-only
4295f9
4295f9
Resolves: #1959836
4295f9
4295f9
(cherry picked from commit 0b3833d6c3b751c6dfb40eeb2ef852984c58f546)
4295f9
---
4295f9
 man/logind.conf.xml      | 2 +-
4295f9
 src/login/logind-core.c  | 2 +-
4295f9
 src/login/logind.conf.in | 2 +-
4295f9
 3 files changed, 3 insertions(+), 3 deletions(-)
4295f9
4295f9
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
4295f9
index be62b6b572..bec7ff44af 100644
4295f9
--- a/man/logind.conf.xml
4295f9
+++ b/man/logind.conf.xml
4295f9
@@ -346,7 +346,7 @@
4295f9
         user fully logs out. Takes a boolean argument. If enabled, the user may not consume IPC resources after the
4295f9
         last of the user's sessions terminated. This covers System V semaphores, shared memory and message queues, as
4295f9
         well as POSIX shared memory and message queues. Note that IPC objects of the root user and other system users
4295f9
-        are excluded from the effect of this setting. Defaults to <literal>yes</literal>.</para></listitem>
4295f9
+        are excluded from the effect of this setting. Defaults to <literal>no</literal>.</para></listitem>
4295f9
       </varlistentry>
4295f9
 
4295f9
     </variablelist>
4295f9
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
4295f9
index 22031f485a..f5e1126adc 100644
4295f9
--- a/src/login/logind-core.c
4295f9
+++ b/src/login/logind-core.c
4295f9
@@ -34,7 +34,7 @@ void manager_reset_config(Manager *m) {
4295f9
 
4295f9
         m->n_autovts = 6;
4295f9
         m->reserve_vt = 6;
4295f9
-        m->remove_ipc = true;
4295f9
+        m->remove_ipc = false;
4295f9
         m->inhibit_delay_max = 5 * USEC_PER_SEC;
4295f9
         m->user_stop_delay = 10 * USEC_PER_SEC;
4295f9
 
4295f9
diff --git a/src/login/logind.conf.in b/src/login/logind.conf.in
4295f9
index 27ba77ce79..f9c5099865 100644
4295f9
--- a/src/login/logind.conf.in
4295f9
+++ b/src/login/logind.conf.in
4295f9
@@ -39,6 +39,6 @@
4295f9
 #IdleActionSec=30min
4295f9
 #RuntimeDirectorySize=10%
4295f9
 #RuntimeDirectoryInodes=400k
4295f9
-#RemoveIPC=yes
4295f9
+#RemoveIPC=no
4295f9
 #InhibitorsMax=8192
4295f9
 #SessionsMax=8192