Light Display Manager

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

  1. lightdm-pam-kwallet5
  2. Merge into trunk
Proposed by Harald Sitter
Status: Merged
Merged at revision: 2178
Proposed branch: lp:~apachelogger/lightdm/lightdm-pam-kwallet5
Merge into: lp:lightdm
Diff against target: 53 lines (+11/-0)
3 files modified
debian/changelog (+7/-0)
debian/lightdm.lightdm-greeter.pam (+2/-0)
debian/lightdm.pam (+2/-0)
To merge this branch: bzr merge lp:~apachelogger/lightdm/lightdm-pam-kwallet5
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+268899@code.launchpad.net

Description of the change

add pam kwallet5

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Thanks Harald!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-08-16 22:44:33 +0000
3+++ debian/changelog 2015-08-24 11:02:40 +0000
4@@ -1,3 +1,10 @@
5+lightdm (1.15.3-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Load pam_kwallet5 in pam profile (kwallet and kwallet5 are distinct
8+ entities requiring sepreate unlocking)
9+
10+ -- Harald Sitter <sitter@kde.org> Mon, 24 Aug 2015 12:50:00 +0200
11+
12 lightdm (1.15.3-0ubuntu1) wily; urgency=medium
13
14 * New upstream release:
15
16=== modified file 'debian/lightdm.lightdm-greeter.pam'
17--- debian/lightdm.lightdm-greeter.pam 2014-04-10 08:35:38 +0000
18+++ debian/lightdm.lightdm-greeter.pam 2015-08-24 11:02:40 +0000
19@@ -2,6 +2,7 @@
20 auth required pam_permit.so
21 auth optional pam_gnome_keyring.so
22 auth optional pam_kwallet.so
23+auth optional pam_kwallet5.so
24 @include common-account
25 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
26 session required pam_limits.so
27@@ -9,5 +10,6 @@
28 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
29 session optional pam_gnome_keyring.so auto_start
30 session optional pam_kwallet.so auto_start
31+session optional pam_kwallet5.so auto_start
32 session required pam_env.so readenv=1
33 session required pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
34
35=== modified file 'debian/lightdm.pam'
36--- debian/lightdm.pam 2014-04-10 08:35:38 +0000
37+++ debian/lightdm.pam 2015-08-24 11:02:40 +0000
38@@ -4,6 +4,7 @@
39 @include common-auth
40 auth optional pam_gnome_keyring.so
41 auth optional pam_kwallet.so
42+auth optional pam_kwallet5.so
43 @include common-account
44 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
45 session required pam_limits.so
46@@ -11,6 +12,7 @@
47 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
48 session optional pam_gnome_keyring.so auto_start
49 session optional pam_kwallet.so auto_start
50+session optional pam_kwallet5.so auto_start
51 session required pam_env.so readenv=1
52 session required pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
53 @include common-password

Subscribers

People subscribed via source and target branches