From 5207e6f1bef24cbff989414acc90216908eed98d Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Thu, 27 Feb 2020 16:19:59 -0800
Subject: [PATCH] Relax implicit ASKPASS requirements for X11 forwarding
 scenarios (#428)

---
 readpass.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/readpass.c b/readpass.c
index 7f1c01bdc..676bd7aa1 100644
--- a/readpass.c
+++ b/readpass.c
@@ -183,10 +183,19 @@ read_passphrase(const char *prompt, int flags)
 			askpass = getenv(SSH_ASKPASS_ENV);
 		else
 			askpass = _PATH_SSH_ASKPASS_DEFAULT;
+
+#ifdef WINDOWS
+		if (getenv(SSH_ASKPASS_ENV)) {
+#endif
+
 		if ((ret = ssh_askpass(askpass, prompt)) == NULL)
 			if (!(flags & RP_ALLOW_EOF))
 				return xstrdup("");
 		return ret;
+
+#ifdef WINDOWS
+		}
+#endif
 	}
 
 	if (readpassphrase(prompt, buf, sizeof buf, rppflags) == NULL) {