diff options
| author | Armin K <krejzi@email.com> | 2013-03-27 12:30:27 +0100 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2013-07-30 09:07:58 -0400 |
| commit | ca89cbe90131693c12a8e30256755d62f745e385 (patch) | |
| tree | 5cfc74fa2dbb869be854d4fc7712fc587b3670c1 /data/pam-lfs | |
| parent | 95975ad7a000a2ef6e4ffb71d0f0276571e2622b (diff) | |
| download | gdm-ca89cbe90131693c12a8e30256755d62f745e385.tar.gz | |
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
Diffstat (limited to 'data/pam-lfs')
| -rw-r--r-- | data/pam-lfs/gdm-fingerprint.pam | 2 | ||||
| -rw-r--r-- | data/pam-lfs/gdm-launch-environment.pam | 5 | ||||
| -rw-r--r-- | data/pam-lfs/gdm-pin.pam | 13 | ||||
| -rw-r--r-- | 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 45a74905..5818645c 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 d926c79d..f9507a08 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 03d324ec..f265497e 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 69ed9343..b9ae48b8 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 |