diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 14:18:15 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:49:50 +1000 |
commit | 5f4082d886c6173b9e90b9768c9a38a3bfd92c2b (patch) | |
tree | 76ca3a7c1727cb3203b982cce20b511eee4d9b09 /auth2-gss.c | |
parent | 7da5df11ac788bc1133d8d598d298e33500524cc (diff) |
upstream commit
sshd: pass struct ssh to auth functions; ok djm@
Upstream-ID: b00a80c3460884ebcdd14ef550154c761aebe488
Diffstat (limited to 'auth2-gss.c')
-rw-r--r-- | auth2-gss.c | 14 |
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) | |||
129 | static int | 129 | static int |
130 | input_gssapi_token(int type, u_int32_t plen, void *ctxt) | 130 | input_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) | |||
184 | static int | 185 | static int |
185 | input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) | 186 | input_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) | |||
225 | static int | 227 | static int |
226 | input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt) | 228 | input_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) | |||
252 | static int | 255 | static int |
253 | input_gssapi_mic(int type, u_int32_t plen, void *ctxt) | 256 | input_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; |