diff options
author | Damien Miller <djm@mindrot.org> | 2002-09-25 12:19:39 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-09-25 12:19:39 +1000 |
commit | 7db40c9e2e457441b1935d425326e507e945c039 (patch) | |
tree | 92ddce20d3e7ce07a732f95055a37084b2b8c82a /monitor.c | |
parent | b2f844dc513d31de09ae696092497856a2968d26 (diff) |
- markus@cvs.openbsd.org 2002/09/23 22:11:05
[monitor.c]
only call auth_krb5 if kerberos is enabled; ok deraadt@
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.26 2002/09/09 14:54:15 markus Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.27 2002/09/23 22:11:05 markus Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -1299,7 +1299,8 @@ mm_answer_krb5(int socket, Buffer *m) | |||
1299 | tkt.data = buffer_get_string(m, &len); | 1299 | tkt.data = buffer_get_string(m, &len); |
1300 | tkt.length = len; | 1300 | tkt.length = len; |
1301 | 1301 | ||
1302 | success = auth_krb5(authctxt, &tkt, &client_user, &reply); | 1302 | success = (options.kerberos_authentication == 1) && |
1303 | auth_krb5(authctxt, &tkt, &client_user, &reply); | ||
1303 | 1304 | ||
1304 | if (tkt.length) | 1305 | if (tkt.length) |
1305 | xfree(tkt.data); | 1306 | xfree(tkt.data); |