Light Display Manager

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

  1. pam-kwallet
  2. Merge into trunk
Proposed by Harald Sitter
Status: Merged
Merged at revision: 1956
Proposed branch: lp:~apachelogger/lightdm/pam-kwallet
Merge into: lp:lightdm
Diff against target: 50 lines (+10/-0)
3 files modified
debian/changelog (+6/-0)
debian/lightdm.lightdm-greeter.pam (+2/-0)
debian/lightdm.pam (+2/-0)
To merge this branch: bzr merge lp:~apachelogger/lightdm/pam-kwallet
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Robert Ancell Pending
Review via email: mp+215108@code.launchpad.net

Description of the change

add kwallet pam loading

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

It's the counterpart of gnome-keyring, so LGTM. Thanks!

review: Approve
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Could you also merge this into lp:lightdm/1.10? We've branched the trusty series off.

Revision history for this message
Martin Pitt (pitti) wrote :

Sure, done.

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 2014-04-08 04:23:04 +0000
3+++ debian/changelog 2014-04-10 08:40:43 +0000
4@@ -1,3 +1,9 @@
5+lightdm (1.10.0-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Add pam_kwallet to pam configs. (LP: #1305307)
8+
9+ -- Harald Sitter <apachelogger@kubuntu.org> Thu, 10 Apr 2014 10:27:18 +0200
10+
11 lightdm (1.10.0-0ubuntu1) trusty; urgency=medium
12
13 * New upstream release:
14
15=== modified file 'debian/lightdm.lightdm-greeter.pam'
16--- debian/lightdm.lightdm-greeter.pam 2013-07-16 23:36:16 +0000
17+++ debian/lightdm.lightdm-greeter.pam 2014-04-10 08:40:43 +0000
18@@ -1,11 +1,13 @@
19 #%PAM-1.0
20 auth required pam_permit.so
21 auth optional pam_gnome_keyring.so
22+auth optional pam_kwallet.so
23 @include common-account
24 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
25 session required pam_limits.so
26 @include common-session
27 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
28 session optional pam_gnome_keyring.so auto_start
29+session optional pam_kwallet.so auto_start
30 session required pam_env.so readenv=1
31 session required pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
32
33=== modified file 'debian/lightdm.pam'
34--- debian/lightdm.pam 2013-07-16 23:36:16 +0000
35+++ debian/lightdm.pam 2014-04-10 08:40:43 +0000
36@@ -3,12 +3,14 @@
37 auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
38 @include common-auth
39 auth optional pam_gnome_keyring.so
40+auth optional pam_kwallet.so
41 @include common-account
42 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
43 session required pam_limits.so
44 @include common-session
45 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
46 session optional pam_gnome_keyring.so auto_start
47+session optional pam_kwallet.so auto_start
48 session required pam_env.so readenv=1
49 session required pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
50 @include common-password

Subscribers

People subscribed via source and target branches