Relax implicit ASKPASS requirements for X11 forwarding scenarios (#428)
This commit is contained in:
parent
a4e42bd33a
commit
5207e6f1be
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue