diff --git a/cmdline.c b/cmdline.c
index 1a14cc99..0fefb428 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -85,7 +85,7 @@ void cmdline_cleanup(void)
  * return means that we aren't capable of processing the prompt and
  * someone else should do it.
  */
-int cmdline_get_passwd_input(prompts_t *p, const unsigned char *in, int inlen)
+int cmdline_get_passwd_input(prompts_t *p)
 {
     static int tried_once = 0;
 
@@ -94,7 +94,7 @@ int cmdline_get_passwd_input(prompts_t *p, const unsigned char *in, int inlen)
      * passwords), and (currently) we only cope with a password prompt
      * that comes in a prompt-set on its own.
      */
-    if (!cmdline_password || in || p->n_prompts != 1 || p->prompts[0]->echo) {
+    if (!cmdline_password || p->n_prompts != 1 || p->prompts[0]->echo) {
 	return -1;
     }
 
diff --git a/nocmdline.c b/nocmdline.c
index a7643385..a6f62bf5 100644
--- a/nocmdline.c
+++ b/nocmdline.c
@@ -15,7 +15,7 @@
  * handling, then there is no such option, so that function always
  * returns failure.
  */
-int cmdline_get_passwd_input(prompts_t *p, const unsigned char *in, int inlen)
+int cmdline_get_passwd_input(prompts_t *p)
 {
     return -1;
 }
diff --git a/putty.h b/putty.h
index 12499e87..590370f7 100644
--- a/putty.h
+++ b/putty.h
@@ -1396,7 +1396,7 @@ void printer_finish_job(printer_job *);
 int cmdline_process_param(const char *, char *, int, Conf *);
 void cmdline_run_saved(Conf *);
 void cmdline_cleanup(void);
-int cmdline_get_passwd_input(prompts_t *p, const unsigned char *in, int inlen);
+int cmdline_get_passwd_input(prompts_t *p);
 int cmdline_host_ok(Conf *);
 #define TOOLTYPE_FILETRANSFER 1
 #define TOOLTYPE_NONNETWORK 2
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index f3d818a3..8dc3b2d4 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -325,7 +325,7 @@ int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
 {
     struct gui_data *inst = (struct gui_data *)p->frontend;
     int ret;
-    ret = cmdline_get_passwd_input(p, in, inlen);
+    ret = cmdline_get_passwd_input(p);
     if (ret == -1)
 	ret = term_get_userpass_input(inst->term, p, in, inlen);
     return ret;
diff --git a/unix/uxplink.c b/unix/uxplink.c
index 765aadcc..9ff6f530 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -435,7 +435,7 @@ int from_backend_eof(void *frontend_handle)
 int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
 {
     int ret;
-    ret = cmdline_get_passwd_input(p, in, inlen);
+    ret = cmdline_get_passwd_input(p);
     if (ret == -1)
 	ret = console_get_userpass_input(p);
     return ret;
diff --git a/unix/uxsftp.c b/unix/uxsftp.c
index 8576d436..861baabe 100644
--- a/unix/uxsftp.c
+++ b/unix/uxsftp.c
@@ -71,7 +71,7 @@ char *get_ttymode(void *frontend, const char *mode) { return NULL; }
 int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
 {
     int ret;
-    ret = cmdline_get_passwd_input(p, in, inlen);
+    ret = cmdline_get_passwd_input(p);
     if (ret == -1)
 	ret = console_get_userpass_input(p);
     return ret;
diff --git a/windows/window.c b/windows/window.c
index 4c63d7b0..608eb220 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -5937,7 +5937,7 @@ int from_backend_eof(void *frontend)
 int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
 {
     int ret;
-    ret = cmdline_get_passwd_input(p, in, inlen);
+    ret = cmdline_get_passwd_input(p);
     if (ret == -1)
 	ret = term_get_userpass_input(term, p, in, inlen);
     return ret;
diff --git a/windows/winplink.c b/windows/winplink.c
index 35c67fed..1e5f9f65 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -134,7 +134,7 @@ int from_backend_eof(void *frontend_handle)
 int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
 {
     int ret;
-    ret = cmdline_get_passwd_input(p, in, inlen);
+    ret = cmdline_get_passwd_input(p);
     if (ret == -1)
 	ret = console_get_userpass_input(p, in, inlen);
     return ret;
diff --git a/windows/winsftp.c b/windows/winsftp.c
index 4558e5a9..17d332b7 100644
--- a/windows/winsftp.c
+++ b/windows/winsftp.c
@@ -18,7 +18,7 @@ char *get_ttymode(void *frontend, const char *mode) { return NULL; }
 int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
 {
     int ret;
-    ret = cmdline_get_passwd_input(p, in, inlen);
+    ret = cmdline_get_passwd_input(p);
     if (ret == -1)
 	ret = console_get_userpass_input(p, in, inlen);
     return ret;