summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-05-12 10:33:27 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-05-15 19:54:55 +0200
commitdd4f87a8d138d5307cf00c958da0da70dc542a2c (patch)
tree3ea62571b1df186b916ff084b0bdd788e9336331
parent6647cff7766faed5cb57373abc7439b048304638 (diff)
downloadsystemd-dd4f87a8d138d5307cf00c958da0da70dc542a2c.tar.gz
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) (cherry picked from commit ca276dcddc4def7348e2cb897fbf7a8b26bfc5ed)
-rw-r--r--factory/etc/pam.d/system-auth2
-rw-r--r--man/pam_systemd.xml3
-rw-r--r--man/pam_systemd_home.xml2
3 files changed, 4 insertions, 3 deletions
diff --git a/factory/etc/pam.d/system-auth b/factory/etc/pam.d/system-auth
index 522c51324a..c2d6240930 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 21a2581b24..24174213e2 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 93e8435805..906d1c1516 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
<command>-password sufficient pam_systemd_home.so</command>
-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