[SCM] sddm packaging branch, master, updated. 35697b50dd4445549e162438b1db7cc9751d8492

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 35697b50dd4445549e162438b1db7cc9751d8492
Author: Rohan Garg <rohan at kde.org>
Date:   Thu Nov 20 11:21:50 2014 +0100

    Make sure pam files are correct
    
    pam_env.so is required so that PATH is read correctly, please DO NOT
    remove this.
---
 debian/sddm.pam                | 4 +++-
 debian/sddm.sddm-autologin.pam | 3 ++-
 debian/sddm.sddm-greeter.pam   | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/sddm.pam b/debian/sddm.pam
index e8893f2..496b843 100644
--- a/debian/sddm.pam
+++ b/debian/sddm.pam
@@ -4,7 +4,9 @@
 auth    requisite       pam_nologin.so
 auth    required        pam_succeed_if.so user != root quiet_success
 # Load environment from /etc/default/locale and ~/.pam_environment
-auth    required        pam_env.so envfile=/etc/default/locale
+session    required        pam_env.so envfile=/etc/default/locale
+session    required        pam_env.so readenv=1
+
 # auth    sufficient      pam_succeed_if.so user ingroup nopasswdlogin
 @include common-auth
 -auth   optional        pam_gnome_keyring.so
diff --git a/debian/sddm.sddm-autologin.pam b/debian/sddm.sddm-autologin.pam
index 8ecd3cf..2239326 100644
--- a/debian/sddm.sddm-autologin.pam
+++ b/debian/sddm.sddm-autologin.pam
@@ -4,7 +4,8 @@
 auth    requisite       pam_nologin.so
 auth    required        pam_permit.so
 # Load environment from /etc/default/locale and ~/.pam_environment
-auth    required        pam_env.so envfile=/etc/default/locale
+session    required        pam_env.so envfile=/etc/default/locale
+session    required        pam_env.so readenv=1
 
 @include common-account
 
diff --git a/debian/sddm.sddm-greeter.pam b/debian/sddm.sddm-greeter.pam
index 2030859..e889488 100644
--- a/debian/sddm.sddm-greeter.pam
+++ b/debian/sddm.sddm-greeter.pam
@@ -1,7 +1,8 @@
 #%PAM-1.0
 
 # Load environment from /etc/default/locale and ~/.pam_environment
-auth    required        pam_env.so envfile=/etc/default/locale
+session    required        pam_env.so envfile=/etc/default/locale
+session    required        pam_env.so readenv=1
 auth    required        pam_permit.so
 
 @include common-account

-- 
sddm packaging