=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/auth1.c,v retrieving revision 1.40.2.3 retrieving revision 1.41 diff -u -r1.40.2.3 -r1.41 --- src/usr.bin/ssh/Attic/auth1.c 2003/04/03 22:35:16 1.40.2.3 +++ src/usr.bin/ssh/Attic/auth1.c 2002/06/19 00:27:55 1.41 @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth1.c,v 1.40.2.3 2003/04/03 22:35:16 miod Exp $"); +RCSID("$OpenBSD: auth1.c,v 1.41 2002/06/19 00:27:55 deraadt Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -116,51 +116,31 @@ if (kdata[0] == 4) { /* KRB_PROT_VERSION */ #ifdef KRB4 - KTEXT_ST tkt, reply; + KTEXT_ST tkt; + tkt.length = dlen; if (tkt.length < MAX_KTXT_LEN) memcpy(tkt.dat, kdata, tkt.length); - if (PRIVSEP(auth_krb4(authctxt, &tkt, - &client_user, &reply))) { + if (auth_krb4(authctxt, &tkt, &client_user)) { authenticated = 1; snprintf(info, sizeof(info), " tktuser %.100s", client_user); - - packet_start( - SSH_SMSG_AUTH_KERBEROS_RESPONSE); - packet_put_string((char *) - reply.dat, reply.length); - packet_send(); - packet_write_wait(); - xfree(client_user); } #endif /* KRB4 */ } else { #ifdef KRB5 - krb5_data tkt, reply; + krb5_data tkt; tkt.length = dlen; tkt.data = kdata; - if (PRIVSEP(auth_krb5(authctxt, &tkt, - &client_user, &reply))) { + if (auth_krb5(authctxt, &tkt, &client_user)) { authenticated = 1; snprintf(info, sizeof(info), " tktuser %.100s", client_user); - - /* Send response to client */ - packet_start( - SSH_SMSG_AUTH_KERBEROS_RESPONSE); - packet_put_string((char *) - reply.data, reply.length); - packet_send(); - packet_write_wait(); - - if (reply.length) - xfree(reply.data); xfree(client_user); } #endif /* KRB5 */ @@ -288,6 +268,7 @@ debug("rcvd SSH_CMSG_AUTH_TIS_RESPONSE"); if (options.challenge_response_authentication == 1) { char *response = packet_get_string(&dlen); + debug("got response '%s'", response); packet_check_eom(); authenticated = verify_response(authctxt, response); memset(response, 'r', dlen);