[gdm/rhel-7.9: 49/51] data: drop pam_gdm, reintroduce pam_env/postlogin

[Ray Strode <halfline src gnome org>]

commit ac7e5ba0281aee9211fc4486c35fbf8817b7c7a6
Author: Ray Strode <rstrode redhat com>
Date:   Tue Jan 30 10:32:08 2018 -0500

    data: drop pam_gdm, reintroduce pam_env/postlogin
    
    The current upstream pam configuration upstream doesn't really
    make sense in RHEL.
    
    systemd doesn't handle /etc/environment on its own in RHEL and it
    doesn't populate the kernel keyring with disk encrypt passwords,
    so pam_gdm is not useful.
    
    This commit restores the pam configuration to something closer to
    what was shipped in 7.3

 data/pam-redhat/gdm-autologin.pam | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/data/pam-redhat/gdm-autologin.pam b/data/pam-redhat/gdm-autologin.pam
index c31ff27a8..aa99e1b03 100644
--- a/data/pam-redhat/gdm-autologin.pam
+++ b/data/pam-redhat/gdm-autologin.pam
@@ -1,7 +1,7 @@
 #%PAM-1.0
-auth       [success=ok default=1] pam_gdm.so
--auth      optional    pam_gnome_keyring.so
-auth       sufficient  pam_permit.so
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
 account    required    pam_nologin.so
 account    include     system-auth
 password   include     system-auth
@@ -12,5 +12,4 @@ session    required    pam_selinux.so open
 session    optional    pam_keyinit.so force revoke
 session    required    pam_namespace.so
 session    include     system-auth
-session    optional    pam_gnome_keyring.so auto_start
 session    include     postlogin