[SCM] sddm packaging branch, master, updated. dc21a8959b492eab1f2cfc85916b9e616c20a415

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit dc21a8959b492eab1f2cfc85916b9e616c20a415
Author: Rohan Garg <rohan at kde.org>
Date:   Thu Nov 20 12:03:20 2014 +0100

    Document things a bit more, move pam_env to the bottom as dictated
    by the pam_env man page
---
 debian/sddm.pam                | 12 +++++++++---
 debian/sddm.sddm-autologin.pam | 12 +++++++++---
 debian/sddm.sddm-greeter.pam   | 12 +++++++++---
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/debian/sddm.pam b/debian/sddm.pam
index 496b843..e300fdc 100644
--- a/debian/sddm.pam
+++ b/debian/sddm.pam
@@ -3,9 +3,6 @@
 # Block login if they are globally disabled
 auth    requisite       pam_nologin.so
 auth    required        pam_succeed_if.so user != root quiet_success
-# Load environment from /etc/default/locale and ~/.pam_environment
-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
@@ -31,3 +28,12 @@ session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux
 -session optional       pam_kwallet.so auto_start
 
 @include common-password
+
+# From the pam_env man page
+# Since setting of PAM environment variables can have side effects to other modules, this module should be the last one on the stack.
+
+# Load environment from /etc/default/locale, /etc/environment and ~/.pam_environment
+session    required        pam_env.so user_readenv=1
+
+# Load environment from /etc/default/locale and /etc/environment
+session    required        pam_env.so
\ No newline at end of file
diff --git a/debian/sddm.sddm-autologin.pam b/debian/sddm.sddm-autologin.pam
index 2239326..a249065 100644
--- a/debian/sddm.sddm-autologin.pam
+++ b/debian/sddm.sddm-autologin.pam
@@ -3,9 +3,6 @@
 # Block login if they are globally disabled
 auth    requisite       pam_nologin.so
 auth    required        pam_permit.so
-# Load environment from /etc/default/locale and ~/.pam_environment
-session    required        pam_env.so envfile=/etc/default/locale
-session    required        pam_env.so readenv=1
 
 @include common-account
 
@@ -24,3 +21,12 @@ session required        pam_loginuid.so
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
 
 @include common-password
+
+# From the pam_env man page
+# Since setting of PAM environment variables can have side effects to other modules, this module should be the last one on the stack.
+
+# Load environment from /etc/default/locale, /etc/environment and ~/.pam_environment
+session    required        pam_env.so user_readenv=1
+
+# Load environment from /etc/default/locale and /etc/environment
+session    required        pam_env.so
\ No newline at end of file
diff --git a/debian/sddm.sddm-greeter.pam b/debian/sddm.sddm-greeter.pam
index e889488..a7ad961 100644
--- a/debian/sddm.sddm-greeter.pam
+++ b/debian/sddm.sddm-greeter.pam
@@ -1,8 +1,5 @@
 #%PAM-1.0
 
-# Load environment from /etc/default/locale and ~/.pam_environment
-session    required        pam_env.so envfile=/etc/default/locale
-session    required        pam_env.so readenv=1
 auth    required        pam_permit.so
 
 @include common-account
@@ -22,3 +19,12 @@ session required        pam_loginuid.so
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
 
 @include common-password
+
+# From the pam_env man page
+# Since setting of PAM environment variables can have side effects to other modules, this module should be the last one on the stack.
+
+# Load environment from /etc/default/locale, /etc/environment and ~/.pam_environment
+session    required        pam_env.so user_readenv=1
+
+# Load environment from /etc/default/locale and /etc/environment
+session    required        pam_env.so
\ No newline at end of file

-- 
sddm packaging