* debian/patches:

[sojka/debian/lightdm.git] / debian / patches / 05_debianize-pam-files.patch

diff --git a/debian/patches/05_debianize-pam-files.patch b/debian/patches/05_debianize-pam-files.patch
index c8508199d8d946a8a6295174d1e5d52357f7abde..b2dd80648c6fb2f72c980a933a82ccfa4d5c1fb9 100644 (file)
--- a/debian/patches/05_debianize-pam-files.patch
+++ b/debian/patches/05_debianize-pam-files.patch
@@ -1,6 +1,6 @@
 --- a/data/pam/lightdm
 +++ b/data/pam/lightdm
-@@ -1,19 +1,35 @@
+@@ -1,20 +1,35 @@
  #%PAM-1.0
  
  # Block login if they are globally disabled
@@ -17,7 +17,7 @@
  
 -# Check account is active, change password if required
 -account   required pam_unix.so
-+auth  optional pam_gnome_keyring.so
++-auth  optional pam_gnome_keyring.so
  
 -# Allow password to be changed
 -password  required pam_unix.so
@@ -25,6 +25,7 @@
  
 -# Setup session
 -session   required pam_unix.so
+-session   optional pam_systemd.so
 +# SELinux needs to be the first session rule. This ensures that any
 +# lingering context has been cleared. Without out this it is possible
 +# that a module could execute code in the wrong domain.
@@ -43,12 +44,23 @@
 +# When the module is present, "required" would be sufficient (When SELinux
 +# is disabled, this returns success.)
 +
-+session optional        pam_gnome_keyring.so auto_start
++-session optional        pam_gnome_keyring.so auto_start
 +
 +@include common-password
+--- a/data/pam/lightdm-greeter
++++ b/data/pam/lightdm-greeter
+@@ -1,7 +1,7 @@
+ #%PAM-1.0
+ 
+ # Load environment from /etc/environment and ~/.pam_environment
+-auth      required pam_env.so
++auth      required pam_env.so envfile=/etc/default/locale
+ 
+ # Always let the greeter start without authentication
+ auth      required pam_permit.so
 --- a/data/pam/lightdm-autologin
 +++ b/data/pam/lightdm-autologin
-@@ -1,19 +1,35 @@
+@@ -1,20 +1,35 @@
  #%PAM-1.0
  
  # Block login if they are globally disabled
@@ -89,15 +101,5 @@
  
 -# Setup session
 -session   required pam_unix.so
+-session   optional pam_systemd.so
 +@include common-password
---- a/data/pam/lightdm-greeter
-+++ b/data/pam/lightdm-greeter
-@@ -1,7 +1,7 @@
- #%PAM-1.0
- 
- # Load environment from /etc/environment and ~/.pam_environment
--auth      required pam_env.so
-+auth      required pam_env.so envfile=/etc/default/locale
- 
- # Always let the greeter start without authentication
- auth      required pam_permit.so