upstream: pass SSH_ASKPASS_PROMPT hint to y/n key confirm too

OpenBSD-Commit-ID: 08d46712e5e5f1bad0aea68e7717b7bec1ab8959

diff --git a/readpass.c b/readpass.c
index 33fc03bb7941ea007a67609d9bb5f1f75fc6627a..b3e7990369769d3e83729865b6f2408ff937ecff 100644 (file)
--- a/readpass.c
+++ b/readpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readpass.c,v 1.55 2019/11/12 22:34:20 djm Exp $ */
+/* $OpenBSD: readpass.c,v 1.56 2019/11/12 22:35:02 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -75,6 +75,7 @@ ssh_askpass(char *askpass, const char *msg)
                close(p[0]);
                if (dup2(p[1], STDOUT_FILENO) == -1)
                        fatal("ssh_askpass: dup2: %s", strerror(errno));
+               setenv("SSH_ASKPASS_PROMPT", "confirm", 1); /* hint to UI */
                execlp(askpass, askpass, msg, (char *)NULL);
                fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));
        }