Add pam_kwallet to pam configs. (LP: #1305307)

diff --git a/debian/changelog b/debian/changelog
index 1304cf13272f37f301dd33e8b8713c6eeaf99dbe..4ad732979384d9ff9d9f0fb3a471d1f7db1bd277 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lightdm (1.10.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add pam_kwallet to pam configs. (LP: #1305307)
+
+ -- Harald Sitter <apachelogger@kubuntu.org>  Thu, 10 Apr 2014 10:27:18 +0200
+
 lightdm (1.10.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream release:

diff --git a/debian/lightdm.lightdm-greeter.pam b/debian/lightdm.lightdm-greeter.pam
index ba5f314734111661aed320d976f155f63e7e9a7c..e7d21e3a62940d9c084ca476103705cc285446b5 100644 (file)
--- a/debian/lightdm.lightdm-greeter.pam
+++ b/debian/lightdm.lightdm-greeter.pam
@@ -1,11 +1,13 @@
 #%PAM-1.0
 auth    required        pam_permit.so
 auth    optional        pam_gnome_keyring.so
+auth    optional        pam_kwallet.so
 @include common-account
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
 session required        pam_limits.so
 @include common-session
 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 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 c658dbcfdd3cf1dec9845877827fb957e285d370..9bc58b525acac1d3fadfa9f9ac2eaf6bc7496885 100644 (file)
--- a/debian/lightdm.pam
+++ b/debian/lightdm.pam
@@ -3,12 +3,14 @@ auth    requisite       pam_nologin.so
 auth    sufficient      pam_succeed_if.so user ingroup nopasswdlogin
 @include common-auth
 auth    optional        pam_gnome_keyring.so
+auth    optional        pam_kwallet.so
 @include common-account
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
 session required        pam_limits.so
 @include common-session
 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 required        pam_env.so readenv=1
 session required        pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
 @include common-password