summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--monitor.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c31b577d6..18dbc784b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 [canohost.c] 4 [canohost.c]
5 change get_peer_ipaddr() and get_local_ipaddr() to not return NULL for 5 change get_peer_ipaddr() and get_local_ipaddr() to not return NULL for
6 non-sockets; fixes a problem passing NULL to snprintf(). ok markus@ 6 non-sockets; fixes a problem passing NULL to snprintf(). ok markus@
7 - markus@cvs.openbsd.org 2002/09/23 22:11:05
8 [monitor.c]
9 only call auth_krb5 if kerberos is enabled; ok deraadt@
7 10
820020923 1120020923
9 - (tim) [configure.ac] s/return/exit/ patch by dtucker@zip.com.au 12 - (tim) [configure.ac] s/return/exit/ patch by dtucker@zip.com.au
@@ -703,4 +706,4 @@
703 save auth method before monitor_reset_key_state(); bugzilla bug #284; 706 save auth method before monitor_reset_key_state(); bugzilla bug #284;
704 ok provos@ 707 ok provos@
705 708
706$Id: ChangeLog,v 1.2477 2002/09/25 02:19:08 djm Exp $ 709$Id: ChangeLog,v 1.2478 2002/09/25 02:19:39 djm Exp $
diff --git a/monitor.c b/monitor.c
index 69445ee25..69a51fc98 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor.c,v 1.26 2002/09/09 14:54:15 markus Exp $"); 28RCSID("$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);