From cbe80b7552d1012f023f702fe3ca31750047f362 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 3 Mar 2009 18:35:53 +0000 Subject: [PATCH] Handle more gracefully the possibility of a keyboard-interactive prompts packet containing no actual prompts (perhaps due to odd server organisation, or perhaps so it can print a banner message and do nothing else). Previously, the get_userpass_input functions always returned failure when in '-batch' mode, even in this case where no actual input would be required. git-svn-id: svn://svn.tartarus.org/sgt/putty@8490 cda61777-01e9-0310-a592-d414129be87e --- unix/uxcons.c | 2 +- windows/wincons.c | 31 ++++++++++++++++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/unix/uxcons.c b/unix/uxcons.c index f147b35b..2021f40e 100644 --- a/unix/uxcons.c +++ b/unix/uxcons.c @@ -344,7 +344,7 @@ int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen) memset(p->prompts[i]->result, 0, p->prompts[i]->result_len); } - if (console_batch_mode) + if (p->n_prompts && console_batch_mode) return 0; /* diff --git a/windows/wincons.c b/windows/wincons.c index 20fda053..56948840 100644 --- a/windows/wincons.c +++ b/windows/wincons.c @@ -318,14 +318,31 @@ int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen) memset(p->prompts[i]->result, 0, p->prompts[i]->result_len); } - if (console_batch_mode) - return 0; + /* + * The prompts_t might contain a message to be displayed but no + * actual prompt. More usually, though, it will contain + * questions that the user needs to answer, in which case we + * need to ensure that we're able to get the answers. + */ + if (p->n_prompts) { + if (console_batch_mode) + return 0; + hin = GetStdHandle(STD_INPUT_HANDLE); + if (hin == INVALID_HANDLE_VALUE) { + fprintf(stderr, "Cannot get standard input handle\n"); + cleanup_exit(1); + } + } - hin = GetStdHandle(STD_INPUT_HANDLE); - hout = GetStdHandle(STD_OUTPUT_HANDLE); - if (hin == INVALID_HANDLE_VALUE || hout == INVALID_HANDLE_VALUE) { - fprintf(stderr, "Cannot get standard input/output handles\n"); - cleanup_exit(1); + /* + * And if we have anything to print, we need standard output. + */ + if ((p->name_reqd && p->name) || p->instruction || p->n_prompts) { + hout = GetStdHandle(STD_OUTPUT_HANDLE); + if (hout == INVALID_HANDLE_VALUE) { + fprintf(stderr, "Cannot get standard output handle\n"); + cleanup_exit(1); + } } /* -- 2.11.0