From 819a1420800a21ed5a99c96dd27e806dd971e041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Sat, 19 Jan 2002 18:29:50 +0000 Subject: Really back out ache's commits. These files are now precisely as they were twentyfour hours ago, except for RCS ids. --- etc/pam.d/ftpd | 6 ++++-- etc/pam.d/login | 3 ++- etc/pam.d/su | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'etc/pam.d') diff --git a/etc/pam.d/ftpd b/etc/pam.d/ftpd index d32016e15ad7..471b67b10841 100644 --- a/etc/pam.d/ftpd +++ b/etc/pam.d/ftpd @@ -9,8 +9,10 @@ auth required pam_nologin.so no_warn #auth sufficient pam_kerberosIV.so no_warn #auth sufficient pam_krb5.so no_warn #auth sufficient pam_ssh.so no_warn try_first_pass -#auth sufficient pam_opie.so no_warn -auth required pam_unix.so no_warn try_first_pass +# Uncomment either pam_opie or pam_unix, but not both of them. +# pam_unix can't be simple chained with pam_opie, ftpd provides proper fallback +auth required pam_opie.so no_warn +#auth required pam_unix.so no_warn try_first_pass # account #account required pam_kerberosIV.so diff --git a/etc/pam.d/login b/etc/pam.d/login index cecaf133c618..ab7046bc586f 100644 --- a/etc/pam.d/login +++ b/etc/pam.d/login @@ -6,10 +6,10 @@ # auth auth required pam_nologin.so no_warn +#auth sufficient pam_opie.so no_warn #auth sufficient pam_kerberosIV.so no_warn try_first_pass #auth sufficient pam_krb5.so no_warn try_first_pass #auth required pam_ssh.so no_warn try_first_pass -#auth sufficient pam_opie.so no_warn auth required pam_unix.so no_warn try_first_pass # account @@ -24,6 +24,7 @@ account required pam_unix.so session required pam_unix.so # password +#password sufficient pam_opie.so no_warn #password sufficient pam_kerberosIV.so no_warn try_first_pass #password sufficient pam_krb5.so no_warn try_first_pass password required pam_unix.so no_warn try_first_pass diff --git a/etc/pam.d/su b/etc/pam.d/su index e7f6192116ac..8e3a9bcb8522 100644 --- a/etc/pam.d/su +++ b/etc/pam.d/su @@ -9,8 +9,8 @@ auth sufficient pam_rootok.so no_warn auth requisite pam_wheel.so no_warn auth_as_self noroot_ok #auth sufficient pam_kerberosIV.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass auth_as_self +#auth required pam_opie.so no_warn #auth required pam_ssh.so no_warn try_first_pass -#auth sufficient pam_opie.so no_warn auth required pam_unix.so no_warn try_first_pass nullok #auth sufficient pam_rootok.so no_warn ##auth sufficient pam_kerberosIV.so no_warn -- cgit v1.2.3