From ab79099d1684457d040ee7c28b2012e8c1ea9a4f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 7 Dec 2016 20:14:43 +0100 Subject: [PATCH] pam: include pam_keyinit.so in our PAM fragments We want that systemd --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 systemd --system sets up for us. --- src/login/systemd-user.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4 index e33963b..4f85b4b 100644 --- a/src/login/systemd-user.m4 +++ b/src/login/systemd-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_systemd.so -- 2.7.4