[SCM] sddm packaging branch, master, updated. 66dc22210f8094522f9fccf1b0ac7366c636c107

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=2b0e0d9

The following commit has been merged in the master branch:
commit 2b0e0d951ce18e2e38aa97dbe96f4293cdc0983c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 27 20:41:32 2015 +0100

    gnome_keyring breaks QProcess
---
 debian/sddm.pam | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/sddm.pam b/debian/sddm.pam
index 70d5863..a1607be 100644
--- a/debian/sddm.pam
+++ b/debian/sddm.pam
@@ -6,7 +6,8 @@ auth    required        pam_succeed_if.so user != root quiet_success
 
 # auth    sufficient      pam_succeed_if.so user ingroup nopasswdlogin
 @include common-auth
--auth   optional        pam_gnome_keyring.so
+# gnome_keyring breaks QProcess
+# -auth   optional        pam_gnome_keyring.so
 -auth   optional        pam_kwallet.so
 
 @include common-account
@@ -24,7 +25,7 @@ session required        pam_loginuid.so
 # in the proper default security context.  Only sessions which are intended
 # to run in the user's context should be run after this.
 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_gnome_keyring.so auto_start
 -session optional       pam_kwallet.so auto_start
 
 @include common-password

-- 
sddm packaging