diff options
| author | Harald Sitter <apachelogger@ubuntu.com> | 2015-08-24 12:51:30 +0200 |
|---|---|---|
| committer | Harald Sitter <apachelogger@ubuntu.com> | 2015-08-24 12:51:30 +0200 |
| commit | 8fc7e8643b7774c50ee353b5918c5e646580f1af (patch) | |
| tree | 82cfbf8e3ce3d151565f12099b1d1bd0ade9d262 /debian | |
| parent | 08e1b5ec8563737d0753e1344d685cb07731bc0e (diff) | |
| download | lightdm-8fc7e8643b7774c50ee353b5918c5e646580f1af.tar.gz | |
Load pam_kwallet5 in pam profile (kwallet and kwallet5 are distinct
entities requiring sepreate unlocking)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/lightdm.lightdm-greeter.pam | 2 | ||||
| -rw-r--r-- | debian/lightdm.pam | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 9da224b8..de0de1f3 100644 --- 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 e7d21e3a..35736d32 100644 --- 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 9bc58b52..cf564db0 100644 --- 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 |