From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 13 Mar 2019 17:47:28 +0000 (+0100)
Subject: units: turn off keyring handling for user@.service
X-Git-Tag: v242-rc1~110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=928df2c251501f9a693cfd292a8a05c45d1963e2;p=thirdparty%2Fsystemd.git

units: turn off keyring handling for user@.service

This service uses PAM anyway, hence let pam_keyring set things up for
us. Moreover, this way we ensure that the invocation ID is not set for
this service as key, and thus can't confuse the user service's
invocation ID.

Fixes: #11649
---

diff --git a/units/user@.service.in b/units/user@.service.in
index ca98c0515df..e898b397830 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -24,3 +24,4 @@ KillMode=mixed
 Delegate=pids memory
 TasksMax=infinity
 TimeoutStopSec=120s
+KeyringMode=inherit