From ca276dcddc4def7348e2cb897fbf7a8b26bfc5ed Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: May 15 2021 16:28:08 +0000 Subject: pam: fix typo try_authtok → use_authtok This was a copy/paste mistae apparently, there's not "try_authtok" and this was supposed to copy what Fedora uses, which uses "use_authtok" correctly. Hence adjust this. Fixes: #19369 (cherry picked from commit 971c07fc6812315c2b27015dfcc652a747f919ed) --- diff --git a/factory/etc/pam.d/system-auth b/factory/etc/pam.d/system-auth index 522c513..c2d6240 100644 --- a/factory/etc/pam.d/system-auth +++ b/factory/etc/pam.d/system-auth @@ -13,7 +13,7 @@ account sufficient pam_unix.so account required pam_permit.so -password sufficient pam_systemd_home.so -password sufficient pam_unix.so sha512 shadow try_first_pass try_authtok +password sufficient pam_unix.so sha512 shadow try_first_pass use_authtok password required pam_deny.so -session optional pam_keyinit.so revoke diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index 21a2581..2417421 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -318,7 +318,8 @@ account sufficient pam_unix.so account required pam_permit.so -password sufficient pam_systemd_home.so -password sufficient pam_unix.so sha512 shadow try_first_pass try_authtok +password sufficient pam_unix.so sha512 shadow try_first_pass use_authtok + password required pam_deny.so -session optional pam_keyinit.so revoke diff --git a/man/pam_systemd_home.xml b/man/pam_systemd_home.xml index 93e8435..906d1c1 100644 --- a/man/pam_systemd_home.xml +++ b/man/pam_systemd_home.xml @@ -139,7 +139,7 @@ account sufficient pam_unix.so account required pam_permit.so -password sufficient pam_systemd_home.so -password sufficient pam_unix.so sha512 shadow try_first_pass try_authtok +password sufficient pam_unix.so sha512 shadow try_first_pass use_authtok password required pam_deny.so -session optional pam_keyinit.so revoke