[gdm/gnome-3-8] data: update PAM configuration files for LFS distribution

[Ray Strode <halfline src gnome org>]

commit 1de3444daf311fe8dc11c188551863de45351418
Author: Armin K <krejzi email com>
Date:   Wed Mar 27 12:30:27 2013 +0100

    data: update PAM configuration files for LFS distribution
    
    Without this fix, GDM refuses to start up saying that pam_systemd.so
    isn't initialised.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=696577

 data/pam-lfs/gdm-fingerprint.pam        |    2 ++
 data/pam-lfs/gdm-launch-environment.pam |    5 +++--
 data/pam-lfs/gdm-pin.pam                |   13 ++++++-------
 data/pam-lfs/gdm-smartcard.pam          |    2 ++
 4 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/data/pam-lfs/gdm-fingerprint.pam b/data/pam-lfs/gdm-fingerprint.pam
index 45a7490..5818645 100644
--- a/data/pam-lfs/gdm-fingerprint.pam
+++ b/data/pam-lfs/gdm-fingerprint.pam
@@ -6,6 +6,7 @@ auth     required       pam_env.so
 auth     requisite      pam_fprintd.so
 auth     required       pam_succeed_if.so uid >= 1000 quiet
 auth     required       pam_deny.so
+auth     optional       pam_gnome_keyring.so
 
 account  include        system-account
 
@@ -14,5 +15,6 @@ password required       pam_deny.so
 session  optional       pam_keyinit.so revoke
 session  required       pam_limits.so
 session  include        system-session
+session  optional       pam_gnome_keyring.so auto_start
 
 # End /etc/pam.d/gdm-fingerprint
diff --git a/data/pam-lfs/gdm-launch-environment.pam b/data/pam-lfs/gdm-launch-environment.pam
index d926c79..f9507a0 100644
--- a/data/pam-lfs/gdm-launch-environment.pam
+++ b/data/pam-lfs/gdm-launch-environment.pam
@@ -1,4 +1,4 @@
-# Begin /etc/pam.d/gdm-welcome
+# Begin /etc/pam.d/gdm-launch-environment
 
 auth     required       pam_env.so
 auth     required       pam_permit.so
@@ -8,6 +8,7 @@ account  include        system-account
 
 password required       pam_deny.so
 
+session  required       pam_systemd.so kill-session-processes=1
 session  optional       pam_keyinit.so force revoke
 
-# End /etc/pam.d/gdm-welcome
+# End /etc/pam.d/gdm-launch-environment
diff --git a/data/pam-lfs/gdm-pin.pam b/data/pam-lfs/gdm-pin.pam
index 03d324e..f265497 100644
--- a/data/pam-lfs/gdm-pin.pam
+++ b/data/pam-lfs/gdm-pin.pam
@@ -1,20 +1,19 @@
-# Begin /etc/pam.d/gdm-password
+# Begin /etc/pam.d/gdm-pin
 
 auth     requisite      pam_nologin.so
 auth     required       pam_env.so
 
-auth     required       pam_succeed_if.so uid >= 1000 quiet
 auth     requisite      pam_pin.so
-auth     include        system-auth
+auth     required       pam_succeed_if.so uid >= 1000 quiet
+auth     required       pam_deny.so
 auth     optional       pam_gnome_keyring.so
 
 account  include        system-account
 
+password required       pam_pin.so
+
 session  required       pam_limits.so
 session  include        system-session
 session  optional       pam_gnome_keyring.so auto_start
 
-password include        system-password
-password optional       pam_pin.so
-
-# End /etc/pam.d/gdm-password
+# End /etc/pam.d/gdm-pin
diff --git a/data/pam-lfs/gdm-smartcard.pam b/data/pam-lfs/gdm-smartcard.pam
index 69ed934..b9ae48b 100644
--- a/data/pam-lfs/gdm-smartcard.pam
+++ b/data/pam-lfs/gdm-smartcard.pam
@@ -6,6 +6,7 @@ auth     required       pam_env.so
 auth     requisite      pam_pkcs11.so wait_for_card card_only
 auth     required       pam_succeed_if.so uid >= 1000 quiet
 auth     required       pam_deny.so
+auth     optional       pam_gnome_keyring.so
 
 account  include        system-account
 
@@ -14,5 +15,6 @@ password required       pam_pkcs11.so
 session  optional       pam_keyinit.so revoke
 session  required       pam_limits.so
 session  include        system-session
+session  optional       pam_gnome_keyring.so auto_start
 
 # End /etc/pam.d/gdm-smartcard