From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 7 Dec 2016 19:14:43 +0000 (+0100)
Subject: pam: include pam_keyinit.so in our PAM fragments
X-Git-Tag: v233.3~127
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8622c1b84e198fb2d0626e622dfeaaa446e38f3a;p=elogind.git

pam: include pam_keyinit.so in our PAM fragments

We want that elogind --user gets its own keyring as usual, even if the
barebones PAM snippet we ship upstream is used. If we don't do this we get the
basic keyring elogind --system sets up for us.
---

diff --git a/src/login/elogind-user.m4 b/src/login/elogind-user.m4
index 2cb247488..8eb8b3bff 100644
--- a/src/login/elogind-user.m4
+++ b/src/login/elogind-user.m4
@@ -3,10 +3,10 @@
 # Used by systemd --user instances.
 
 account required pam_unix.so
-
 m4_ifdef(`HAVE_SELINUX',
-session  required pam_selinux.so close
-session  required pam_selinux.so nottys open
+session required pam_selinux.so close
+session required pam_selinux.so nottys open
 )m4_dnl
-session  required pam_loginuid.so
+session required pam_loginuid.so
+session optional pam_keyinit.so force revoke
 session optional pam_elogind.so