Merge lp:~apachelogger/lightdm/lightdm-pam-kwallet5 into lp:lightdm

[Harald Sitter]

add pam kwallet5

[Robert Ancell (robert-ancell)]

Thanks Harald!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-16 22:44:33 +0000
+++ debian/changelog	2015-08-24 11:02:40 +0000
@@ -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 <[e-mail]>  Mon, 24 Aug 2015 12:50:00 +0200
+
 lightdm (1.15.3-0ubuntu1) wily; urgency=medium
 
   * New upstream release:
 
=== modified file 'debian/lightdm.lightdm-greeter.pam'
--- debian/lightdm.lightdm-greeter.pam	2014-04-10 08:35:38 +0000
+++ debian/lightdm.lightdm-greeter.pam	2015-08-24 11:02:40 +0000
@@ -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 [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
 
=== modified file 'debian/lightdm.pam'
--- debian/lightdm.pam	2014-04-10 08:35:38 +0000
+++ debian/lightdm.pam	2015-08-24 11:02:40 +0000
@@ -4,6 +4,7 @@
 @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 [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