diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-09-23 22:11:06 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-09-23 22:11:06 +0000 |
| commit | 4dec29aa1469e0ae2d711481be5fe1f4ad4a41ac (patch) | |
| tree | 56dc02babf80c9878b55038b7b1faed6e1c0e960 /usr.bin | |
| parent | ba1986108571479cbcd8a133ea7007af1dca3f19 (diff) | |
only call auth_krb5 if kerberos is enabled; ok deraadt@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/monitor.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c index 0f541163fe9..3e15fc9937b 100644 --- a/usr.bin/ssh/monitor.c +++ b/usr.bin/ssh/monitor.c @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor.c,v 1.26 2002/09/09 14:54:15 markus Exp $"); +RCSID("$OpenBSD: monitor.c,v 1.27 2002/09/23 22:11:05 markus Exp $"); #include <openssl/dh.h> @@ -1264,7 +1264,8 @@ mm_answer_krb5(int socket, Buffer *m) tkt.data = buffer_get_string(m, &len); tkt.length = len; - success = auth_krb5(authctxt, &tkt, &client_user, &reply); + success = (options.kerberos_authentication == 1) && + auth_krb5(authctxt, &tkt, &client_user, &reply); if (tkt.length) xfree(tkt.data); |