upstream commit

sshd: pass struct ssh to auth functions; ok djm@

Upstream-ID: b00a80c3460884ebcdd14ef550154c761aebe488

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 @@
-/* $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;