Load pam_kwallet5 in pam profile (kwallet and kwallet5 are distinct

entities requiring sepreate unlocking)

diff --git a/debian/changelog b/debian/changelog
index 9da224b864e081917b77bd32c51133a362811ded..de0de1f34bcbc00eac2dc0954e40e6ae684c2797 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lightdm (1.15.3-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Load pam_kwallet5 in pam profile (kwallet and kwallet5 are distinct
+    entities requiring sepreate unlocking)
+
+ -- Harald Sitter <sitter@kde.org>  Mon, 24 Aug 2015 12:50:00 +0200
+
 lightdm (1.15.3-0ubuntu1) wily; urgency=medium
 
   * New upstream release:

diff --git a/debian/lightdm.lightdm-greeter.pam b/debian/lightdm.lightdm-greeter.pam
index e7d21e3a62940d9c084ca476103705cc285446b5..35736d3279347fa6cd6ea4caf3d234c4fbce9290 100644 (file)
--- a/debian/lightdm.lightdm-greeter.pam
+++ b/debian/lightdm.lightdm-greeter.pam
@@ -2,6 +2,7 @@
 auth    required        pam_permit.so
 auth    optional        pam_gnome_keyring.so
 auth    optional        pam_kwallet.so
+auth    optional        pam_kwallet5.so
 @include common-account
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
 session required        pam_limits.so
@@ -9,5 +10,6 @@ session required        pam_limits.so
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
 session optional        pam_gnome_keyring.so auto_start
 session optional        pam_kwallet.so auto_start
+session optional        pam_kwallet5.so auto_start
 session required        pam_env.so readenv=1
 session required        pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale

diff --git a/debian/lightdm.pam b/debian/lightdm.pam
index 9bc58b525acac1d3fadfa9f9ac2eaf6bc7496885..cf564db0af06f9c17e0266b04504df1368cfa9ff 100644 (file)
--- a/debian/lightdm.pam
+++ b/debian/lightdm.pam
@@ -4,6 +4,7 @@ auth    sufficient      pam_succeed_if.so user ingroup nopasswdlogin
 @include common-auth
 auth    optional        pam_gnome_keyring.so
 auth    optional        pam_kwallet.so
+auth    optional        pam_kwallet5.so
 @include common-account
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
 session required        pam_limits.so
@@ -11,6 +12,7 @@ session required        pam_limits.so
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
 session optional        pam_gnome_keyring.so auto_start
 session optional        pam_kwallet.so auto_start
+session optional        pam_kwallet5.so auto_start
 session required        pam_env.so readenv=1
 session required        pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
 @include common-password