upstream commit

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

Upstream-ID: b00a80c3460884ebcdd14ef550154c761aebe488

1 files changed, 3 insertions, 2 deletions

diff --git a/auth2-chall.c b/auth2-chall.c
index 4be421287..80f212287 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.45 2017/05/30 08:49:58 markus Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.46 2017/05/30 14:18:15 markus Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -287,7 +287,8 @@ send_userauth_info_request(Authctxt *authctxt)
 static int
 input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
 {
-        Authctxt *authctxt = ctxt;
+        struct ssh *ssh = ctxt;
+        Authctxt *authctxt = ssh->authctxt;
         KbdintAuthctxt *kbdintctxt;
         int authenticated = 0, res;
         u_int i, nresp;