diff options
| author | Damien Miller <djm@mindrot.org> | 2004-06-17 17:19:03 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2004-06-17 17:19:03 +0200 |
| commit | 23f0770a1bf8b0a1aa7c8d4bd78699fa0e9358d0 (patch) | |
| tree | a4011718b766af34f837471c2311e6cd044e2c20 /readpass.c | |
| parent | - (djm) OpenBSD CVS Sync (diff) | |
| download | openssh-23f0770a1bf8b0a1aa7c8d4bd78699fa0e9358d0.tar.xz openssh-23f0770a1bf8b0a1aa7c8d4bd78699fa0e9358d0.zip | |
- djm@cvs.openbsd.org 2004/06/17 15:10:14
[clientloop.c misc.h readconf.c readpass.c ssh.c ssh_config.5]
Add option for confirmation (ControlMaster=ask) via ssh-askpass before
opening shared connections; ok markus@
Diffstat (limited to 'readpass.c')
| -rw-r--r-- | readpass.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/readpass.c b/readpass.c index fc7629c37..eb4f6fdb6 100644 --- a/readpass.c +++ b/readpass.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readpass.c,v 1.29 2004/05/08 00:21:31 djm Exp $"); +RCSID("$OpenBSD: readpass.c,v 1.30 2004/06/17 15:10:14 djm Exp $"); #include "xmalloc.h" #include "misc.h" @@ -103,7 +103,9 @@ read_passphrase(const char *prompt, int flags) int rppflags, use_askpass = 0, ttyfd; rppflags = (flags & RP_ECHO) ? RPP_ECHO_ON : RPP_ECHO_OFF; - if (flags & RP_ALLOW_STDIN) { + if (flags & RP_USE_ASKPASS) + use_askpass = 1; + else if (flags & RP_ALLOW_STDIN) { if (!isatty(STDIN_FILENO)) use_askpass = 1; } else { @@ -115,6 +117,9 @@ read_passphrase(const char *prompt, int flags) use_askpass = 1; } + if ((flags & RP_USE_ASKPASS) && getenv("DISPLAY") == NULL) + return (flags & RP_ALLOW_EOF) ? NULL : xstrdup(""); + if (use_askpass && getenv("DISPLAY")) { if (getenv(SSH_ASKPASS_ENV)) askpass = getenv(SSH_ASKPASS_ENV); |