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

diff --git a/debian/changelog b/debian/changelog
index e078e1f9b8ada839605cb0836ffe436c77f469d1..48c43b4a8aa5218fd379a8e5738fef411ce9b995 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,15 @@ systemd (218-4) UNRELEASED; urgency=medium
     work around ifup not failing on invalid interfaces (see #773539)
   * debian/ifup@.service: Set proper service type (oneshot).
 
+  [ 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>  Tue, 13 Jan 2015 08:18:52 +0100
 
 systemd (218-3) experimental; urgency=medium

diff --git a/debian/patches/Adjust-systemd-user-pam-config-file-for-Debian.patch b/debian/patches/Adjust-systemd-user-pam-config-file-for-Debian.patch
index 078a4a69be8f28df9bdc36e564d26dde80acf623..3fb12da33d03db161d15000e0c11c7e2bd41523c 100644 (file)
--- a/debian/patches/Adjust-systemd-user-pam-config-file-for-Debian.patch
+++ b/debian/patches/Adjust-systemd-user-pam-config-file-for-Debian.patch
@@ -5,18 +5,19 @@ 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 8112d74..1b4a550 100644
+index 8112d74..6b21de6 100644
 --- a/src/login/systemd-user
 +++ b/src/login/systemd-user
-@@ -2,5 +2,5 @@
+@@ -2,5 +2,6 @@
  #
  # Used by systemd --user instances.
  
 -account  include system-auth
 -session  include system-auth
 +@include common-account
-+@include common-session
++@include common-session-noninteractive
++session optional pam_systemd.so