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

diff --git a/usr.bin/ssh/readpass.c b/usr.bin/ssh/readpass.c
index 340a476..4a55e98 100644 (file)
--- a/usr.bin/ssh/readpass.c
+++ b/usr.bin/ssh/readpass.c
@@ -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.
  *
@@ -114,7 +114,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
  * passphrase (allocated with xmalloc).  Exits if EOF is encountered. If
  * 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 *
 read_passphrase(const char *prompt, int flags)
@@ -143,7 +143,7 @@ read_passphrase(const char *prompt, int flags)
                use_askpass = 1;
        else if (flags & RP_ALLOW_STDIN) {
                if (!isatty(STDIN_FILENO)) {
-                       debug("read_passphrase: stdin is not a tty");
+                       debug_f("stdin is not a tty");
                        use_askpass = 1;
                }
        } else {
@@ -159,7 +159,7 @@ read_passphrase(const char *prompt, int flags)
                        (void)write(ttyfd, &cr, 1);
                        close(ttyfd);
                } else {
-                       debug("read_passphrase: can't open %s: %s", _PATH_TTY,
+                       debug_f("can't open %s: %s", _PATH_TTY,
                            strerror(errno));
                        use_askpass = 1;
                }