summaryrefslogtreecommitdiffstats
path: root/crypto/openssh
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2001-05-11 09:36:17 +0000
committermarkm <markm@FreeBSD.org>2001-05-11 09:36:17 +0000
commitcdb0cb9ccd3394435a17e5544d485270058a346b (patch)
treee58beac35013382d710f29bd86f8fd9f7132ad91 /crypto/openssh
parent0da4be9c4788877a9d5ff852ab70d27f9639eac9 (diff)
downloadFreeBSD-src-cdb0cb9ccd3394435a17e5544d485270058a346b.zip
FreeBSD-src-cdb0cb9ccd3394435a17e5544d485270058a346b.tar.gz
Fix make world in the kerberosIV case.
Diffstat (limited to 'crypto/openssh')
-rw-r--r--crypto/openssh/auth1.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/openssh/auth1.c b/crypto/openssh/auth1.c
index db8a463..0e494eb 100644
--- a/crypto/openssh/auth1.c
+++ b/crypto/openssh/auth1.c
@@ -118,7 +118,11 @@ do_authloop(Authctxt *authctxt)
/* If the user has no password, accept authentication immediately. */
if (options.password_authentication &&
#if defined(KRB4) || defined(KRB5)
- (!options.kerberos_authentication || options.kerberos_or_local_passwd) &&
+ (!options.kerberos_authentication
+#if defined(KRB4)
+ || options.krb4_or_local_passwd
+#endif
+ ) &&
#endif
#ifdef USE_PAM
auth_pam_password(authctxt, "")
OpenPOWER on IntegriCloud