summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2018-01-30 10:32:08 -0500
committerRay Strode <rstrode@redhat.com>2021-04-12 16:57:53 -0400
commitac7e5ba0281aee9211fc4486c35fbf8817b7c7a6 (patch)
tree93b57fda6b0ab99cfa0b8c5133d81937c8276790
parent32c69e8dc5a1880ada6890ae099997d6c439274a (diff)
downloadgdm-ac7e5ba0281aee9211fc4486c35fbf8817b7c7a6.tar.gz
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
-rw-r--r--data/pam-redhat/gdm-autologin.pam7
1 files changed, 3 insertions, 4 deletions
diff --git a/data/pam-redhat/gdm-autologin.pam b/data/pam-redhat/gdm-autologin.pam
index c31ff27a..aa99e1b0 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