diff options
| author | Dug Song <dugsong@cvs.openbsd.org> | 1999-10-17 23:11:25 +0000 |
|---|---|---|
| committer | Dug Song <dugsong@cvs.openbsd.org> | 1999-10-17 23:11:25 +0000 |
| commit | 7a6b49095e8d54ab163f95bd8695c24bed941540 (patch) | |
| tree | 443f64127136633d4f262438e67901286aff65c1 /usr.bin/ssh/sshd.c | |
| parent | e17d90eae9b2a369b9989de52d61878006cc9322 (diff) | |
don't use KerberosOrLocalPassword unless KerberosAuthentication is set - from millert@
Diffstat (limited to 'usr.bin/ssh/sshd.c')
| -rw-r--r-- | usr.bin/ssh/sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 3f5e6edfe52..b7abd939fcc 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -18,7 +18,7 @@ agent connections. */ #include "includes.h" -RCSID("$Id: sshd.c,v 1.37 1999/10/17 20:48:07 dugsong Exp $"); +RCSID("$Id: sshd.c,v 1.38 1999/10/17 23:11:24 dugsong Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -1069,7 +1069,7 @@ do_authentication(char *user, int privileged_port) /* If the user has no password, accept authentication immediately. */ if (options.password_authentication && #ifdef KRB4 - options.kerberos_or_local_passwd && + (!options.kerberos_authentication || options.kerberos_or_local_passwd) && #endif /* KRB4 */ auth_password(pw, "")) { |