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) | |
| download | openssh-git-5f4082d886c6173b9e90b9768c9a38a3bfd92c2b.tar.gz | |
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 1ca83577..5bfcb9b4 100644 --- a/auth2-gss.c +++ b/auth2-gss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-gss.c,v 1.22 2015/01/19 20:07:45 markus Exp $ */ +/* $OpenBSD: auth2-gss.c,v 1.23 2017/05/30 14:18:15 markus Exp $ */ /* * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. @@ -129,7 +129,8 @@ userauth_gssapi(Authctxt *authctxt) static int input_gssapi_token(int type, u_int32_t plen, void *ctxt) { - Authctxt *authctxt = ctxt; + struct ssh *ssh = ctxt; + Authctxt *authctxt = ssh->authctxt; Gssctxt *gssctxt; gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; gss_buffer_desc recv_tok; @@ -184,7 +185,8 @@ input_gssapi_token(int type, u_int32_t plen, void *ctxt) static int input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) { - Authctxt *authctxt = ctxt; + struct ssh *ssh = ctxt; + Authctxt *authctxt = ssh->authctxt; Gssctxt *gssctxt; gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; gss_buffer_desc recv_tok; @@ -225,7 +227,8 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) static int input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt) { - Authctxt *authctxt = ctxt; + struct ssh *ssh = ctxt; + Authctxt *authctxt = ssh->authctxt; int authenticated; if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep)) @@ -252,7 +255,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt) static int input_gssapi_mic(int type, u_int32_t plen, void *ctxt) { - Authctxt *authctxt = ctxt; + struct ssh *ssh = ctxt; + Authctxt *authctxt = ssh->authctxt; Gssctxt *gssctxt; int authenticated = 0; Buffer b; |