Reported by Tim Kosse: on Unix, read_random_seed() wasn't correctly checking

[sgt/putty] / unix / uxcons.c

diff --git a/unix/uxcons.c b/unix/uxcons.c
index 16e69fb..2021f40 100644 (file)
--- 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;
 
     /*
@@ -416,8 +416,6 @@ int is_interactive(void)
  * X11-forwarding-related things suitable for console.
  */
 
-const char platform_x11_best_transport[] = "unix";
-
 char *platform_get_x_display(void) {
     return dupstr(getenv("DISPLAY"));
 }