Commit 12be9c68 authored by Martin Pitt's avatar Martin Pitt
Browse files

Use common-session-noninteractive in systemd-user's PAM config

Instead of common-session. The latter can include PAM modules like libpam-mount
which expect to be called just once and/or interactively, which already happens
for login, ssh, or the display-manager. Add pam_systemd.so explicitly, as it's
not included in -noninteractive, but is always required (and idempotent).

There is no net change on systemd which don't use manually installed PAM
modules.

Closes: #739676
parent af0db38e
systemd (215-10) UNRELEASED; urgency=medium
[ Christian Kastner ]
* Use common-session-noninteractive in systemd-user's PAM config, instead of
common-session. The latter can include PAM modules like libpam-mount which
expect to be called just once and/or interactively, which already happens
for login, ssh, or the display-manager. Add pam_systemd.so explicitly, as
it's not included in -noninteractive, but is always required (and
idempotent). There is no net change on systemd which don't use manually
installed PAM modules. (Closes: #739676)
-- Martin Pitt <mpitt@debian.org> Wed, 21 Jan 2015 12:03:48 +0100
systemd (215-9) unstable; urgency=medium
[ Didier Roche ]
......
......@@ -5,20 +5,21 @@ Subject: Adjust systemd-user pam config file for Debian
This pam config file is used by libpam-systemd/systemd-logind when
launching systemd user instances.
---
src/login/systemd-user | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
src/login/systemd-user | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/login/systemd-user b/src/login/systemd-user
index 7b57dbf..f87d560 100644
index 7b57dbf..cf8d9c8 100644
--- a/src/login/systemd-user
+++ b/src/login/systemd-user
@@ -2,7 +2,7 @@
@@ -2,7 +2,8 @@
# Used by systemd when launching systemd user instances.
-account include system-auth
-session include system-auth
+@include common-account
+@include common-session
+@include common-session-noninteractive
auth required pam_deny.so
password required pam_deny.so
+session optional pam_systemd.so
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment