summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-12-07 20:14:43 +0100
committerLennart Poettering <lennart@poettering.net>2016-12-13 20:59:36 +0100
commitab79099d1684457d040ee7c28b2012e8c1ea9a4f (patch)
tree2ee1d18b7b8f3b32ddd5525db3552fc1c1f6d9e5 /src
parentb3415f5daef49642be3d5f417b8880c078420ff7 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/login/systemd-user.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
index e33963b125..4f85b4b7fe 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