summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2002-09-24 08:46:05 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2002-09-24 08:46:05 +0000
commit8bad5a57c21169c9d2f1898cdd5bafb4a42ffb38 (patch)
treebca3de5af416003ee5d6d078a47899acfdb7a167 /usr.bin/ssh
parent595b31cdd43f471cfa64e7f7b650d6751d4d1a52 (diff)
only call kerberos code for authctxt->valid
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/monitor.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index 3e15fc9937b..e055433ee22 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.27 2002/09/23 22:11:05 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.28 2002/09/24 08:46:04 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 = (options.kerberos_authentication == 1) &&
+ success = options.kerberos_authentication &&
+ authctxt->valid &&
auth_krb5(authctxt, &tkt, &client_user, &reply);
if (tkt.length)