From 64a9b3ed673a7a56b133d2d2a0be709adcb0f696 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Fri, 10 May 2019 10:26:05 +0100
Subject: [PATCH] Print 'instruction' field in keyboard-interactive auth.

When I reworked this code to make it strbuf-based, I apparently forgot
to copy the contents of one particular strbuf into the prompts_t.
---
 ssh2userauth.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssh2userauth.c b/ssh2userauth.c
index 7ef18650..e7142683 100644
--- a/ssh2userauth.c
+++ b/ssh2userauth.c
@@ -1310,6 +1310,8 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
                     } else {
                         s->cur_prompt->instr_reqd = false;
                     }
+                    if (sb->len)
+                        s->cur_prompt->instruction = strbuf_to_str(sb);
 
                     /*
                      * Our prompts_t is fully constructed now. Get the