tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2002/09/23 22:11:05 

[monitor.c]
     only call auth_krb5 if kerberos is enabled; ok deraadt@
This commit is contained in:
Damien Miller 2002-09-25 12:19:39 +10:00
parent b2f844dc51
commit 7db40c9e2e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4,6 +4,9 @@
[canohost.c] [canohost.c]
change get_peer_ipaddr() and get_local_ipaddr() to not return NULL for change get_peer_ipaddr() and get_local_ipaddr() to not return NULL for
non-sockets; fixes a problem passing NULL to snprintf(). ok markus@ non-sockets; fixes a problem passing NULL to snprintf(). ok markus@
- markus@cvs.openbsd.org 2002/09/23 22:11:05
[monitor.c]
only call auth_krb5 if kerberos is enabled; ok deraadt@
20020923 20020923
- (tim) [configure.ac] s/return/exit/ patch by dtucker@zip.com.au - (tim) [configure.ac] s/return/exit/ patch by dtucker@zip.com.au
@ -703,4 +706,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2477 2002/09/25 02:19:08 djm Exp $ $Id: ChangeLog,v 1.2478 2002/09/25 02:19:39 djm Exp $

5
monitor.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #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> #include <openssl/dh.h>
@ -1299,7 +1299,8 @@ mm_answer_krb5(int socket, Buffer *m)
tkt.data = buffer_get_string(m, &len); tkt.data = buffer_get_string(m, &len);
tkt.length = 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) if (tkt.length)
xfree(tkt.data); xfree(tkt.data);