summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sshconnect2.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index dab905b58..ac3dce54c 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.261 2017/05/30 14:23:52 markus Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.262 2017/05/31 05:08:46 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -703,9 +703,8 @@ userauth_gssapi(Authctxt *authctxt)
703} 703}
704 704
705static OM_uint32 705static OM_uint32
706process_gssapi_token(void *ctxt, gss_buffer_t recv_tok) 706process_gssapi_token(struct ssh *ssh, gss_buffer_t recv_tok)
707{ 707{
708 struct ssh *ssh = ctxt;
709 Authctxt *authctxt = ssh->authctxt; 708 Authctxt *authctxt = ssh->authctxt;
710 Gssctxt *gssctxt = authctxt->methoddata; 709 Gssctxt *gssctxt = authctxt->methoddata;
711 gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; 710 gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
@@ -789,7 +788,7 @@ input_gssapi_response(int type, u_int32_t plen, struct ssh *ssh)
789 788
790 free(oidv); 789 free(oidv);
791 790
792 if (GSS_ERROR(process_gssapi_token(ctxt, GSS_C_NO_BUFFER))) { 791 if (GSS_ERROR(process_gssapi_token(ssh, GSS_C_NO_BUFFER))) {
793 /* Start again with next method on list */ 792 /* Start again with next method on list */
794 debug("Trying to start again"); 793 debug("Trying to start again");
795 userauth(authctxt, NULL); 794 userauth(authctxt, NULL);
@@ -815,7 +814,7 @@ input_gssapi_token(int type, u_int32_t plen, struct ssh *ssh)
815 814
816 packet_check_eom(); 815 packet_check_eom();
817 816
818 status = process_gssapi_token(ctxt, &recv_tok); 817 status = process_gssapi_token(ssh, &recv_tok);
819 818
820 free(recv_tok.value); 819 free(recv_tok.value);
821 820