summaryrefslogtreecommitdiff
path: root/auth2-gss.c
diff options
context:
space:
mode:
Diffstat (limited to 'auth2-gss.c')
-rw-r--r--auth2-gss.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/auth2-gss.c b/auth2-gss.c
index 1ca835773..5bfcb9b46 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-gss.c,v 1.22 2015/01/19 20:07:45 markus Exp $ */ 1/* $OpenBSD: auth2-gss.c,v 1.23 2017/05/30 14:18:15 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. 4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -129,7 +129,8 @@ userauth_gssapi(Authctxt *authctxt)
129static int 129static int
130input_gssapi_token(int type, u_int32_t plen, void *ctxt) 130input_gssapi_token(int type, u_int32_t plen, void *ctxt)
131{ 131{
132 Authctxt *authctxt = ctxt; 132 struct ssh *ssh = ctxt;
133 Authctxt *authctxt = ssh->authctxt;
133 Gssctxt *gssctxt; 134 Gssctxt *gssctxt;
134 gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; 135 gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
135 gss_buffer_desc recv_tok; 136 gss_buffer_desc recv_tok;
@@ -184,7 +185,8 @@ input_gssapi_token(int type, u_int32_t plen, void *ctxt)
184static int 185static int
185input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) 186input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
186{ 187{
187 Authctxt *authctxt = ctxt; 188 struct ssh *ssh = ctxt;
189 Authctxt *authctxt = ssh->authctxt;
188 Gssctxt *gssctxt; 190 Gssctxt *gssctxt;
189 gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; 191 gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
190 gss_buffer_desc recv_tok; 192 gss_buffer_desc recv_tok;
@@ -225,7 +227,8 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
225static int 227static int
226input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt) 228input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt)
227{ 229{
228 Authctxt *authctxt = ctxt; 230 struct ssh *ssh = ctxt;
231 Authctxt *authctxt = ssh->authctxt;
229 int authenticated; 232 int authenticated;
230 233
231 if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep)) 234 if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep))
@@ -252,7 +255,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt)
252static int 255static int
253input_gssapi_mic(int type, u_int32_t plen, void *ctxt) 256input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
254{ 257{
255 Authctxt *authctxt = ctxt; 258 struct ssh *ssh = ctxt;
259 Authctxt *authctxt = ssh->authctxt;
256 Gssctxt *gssctxt; 260 Gssctxt *gssctxt;
257 int authenticated = 0; 261 int authenticated = 0;
258 Buffer b; 262 Buffer b;