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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit a1ea5d33b500913689caced26f40a232c39053ff
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Nov 20 12:39:10 2014 +0100

    fix pam_env properly
    
    - add newlines at end of files
    - do not load user environment it's really something a sysadmin should
      decide, also we did not do that in kdm, so trusting the past selves there
      probably was a good reason for that
    - fix comments to actually reflect the loaded files correctly
---
 debian/sddm.pam                | 8 ++++----
 debian/sddm.sddm-autologin.pam | 8 ++++----
 debian/sddm.sddm-greeter.pam   | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/sddm.pam b/debian/sddm.pam
index e300fdc..70d5863 100644
--- a/debian/sddm.pam
+++ b/debian/sddm.pam
@@ -32,8 +32,8 @@ session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux
 # 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/environment
+session required        pam_env.so
 
-# Load environment from /etc/default/locale and /etc/environment
-session    required        pam_env.so
\ No newline at end of file
+# Load environment from /etc/default/locale
+session required        pam_env.so envfile=/etc/default/locale
diff --git a/debian/sddm.sddm-autologin.pam b/debian/sddm.sddm-autologin.pam
index a249065..d595682 100644
--- a/debian/sddm.sddm-autologin.pam
+++ b/debian/sddm.sddm-autologin.pam
@@ -25,8 +25,8 @@ session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux
 # 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/environment
+session required        pam_env.so
 
-# Load environment from /etc/default/locale and /etc/environment
-session    required        pam_env.so
\ No newline at end of file
+# Load environment from /etc/default/locale
+session required        pam_env.so envfile=/etc/default/locale
diff --git a/debian/sddm.sddm-greeter.pam b/debian/sddm.sddm-greeter.pam
index a7ad961..69f32a6 100644
--- a/debian/sddm.sddm-greeter.pam
+++ b/debian/sddm.sddm-greeter.pam
@@ -23,8 +23,8 @@ session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux
 # 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/environment
+session required        pam_env.so
 
-# Load environment from /etc/default/locale and /etc/environment
-session    required        pam_env.so
\ No newline at end of file
+# Load environment from /etc/default/locale
+session required        pam_env.so envfile=/etc/default/locale

-- 
sddm packaging