tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: mention in comment that read_passphrase(..., RP_ALLOW_STDIN) 

will try to use askpass first. bz3314

convert a couple of debug() -> debug_f() while here

OpenBSD-Commit-ID: c7e812aebc28fcc5db06d4710e0f73613dee545c
This commit is contained in:
djm@openbsd.org 2021-07-23 05:56:47 +00:00 committed by Damien Miller
parent 1653ece683
commit 03190d1098
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
readpass.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readpass.c,v 1.68 2020/11/10 07:46:20 claudio Exp $ */ /* $OpenBSD: readpass.c,v 1.69 2021/07/23 05:56:47 djm Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -117,7 +117,7 @@ ssh_askpass(char *askpass, const char *msg, const char *env_hint)
* Reads a passphrase from /dev/tty with echo turned off/on. Returns the * Reads a passphrase from /dev/tty with echo turned off/on. Returns the
* passphrase (allocated with xmalloc). Exits if EOF is encountered. If * passphrase (allocated with xmalloc). Exits if EOF is encountered. If
* RP_ALLOW_STDIN is set, the passphrase will be read from stdin if no * RP_ALLOW_STDIN is set, the passphrase will be read from stdin if no
* tty is available * tty is or askpass program is available
*/ */
char * char *
read_passphrase(const char *prompt, int flags) read_passphrase(const char *prompt, int flags)
@ -146,7 +146,7 @@ read_passphrase(const char *prompt, int flags)
use_askpass = 1; use_askpass = 1;
else if (flags & RP_ALLOW_STDIN) { else if (flags & RP_ALLOW_STDIN) {
if (!isatty(STDIN_FILENO)) { if (!isatty(STDIN_FILENO)) {
debug("read_passphrase: stdin is not a tty"); debug_f("stdin is not a tty");
use_askpass = 1; use_askpass = 1;
} }
} else { } else {
@ -162,7 +162,7 @@ read_passphrase(const char *prompt, int flags)
(void)write(ttyfd, &cr, 1); (void)write(ttyfd, &cr, 1);
close(ttyfd); close(ttyfd);
} else { } else {
debug("read_passphrase: can't open %s: %s", _PATH_TTY, debug_f("can't open %s: %s", _PATH_TTY,
strerror(errno)); strerror(errno));
use_askpass = 1; use_askpass = 1;
} }