===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readpass.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- src/usr.bin/ssh/readpass.c	2019/11/12 22:35:02	1.56
+++ src/usr.bin/ssh/readpass.c	2019/11/15 00:32:40	1.57
@@ -1,4 +1,4 @@
-/* $OpenBSD: readpass.c,v 1.56 2019/11/12 22:35:02 djm Exp $ */
+/* $OpenBSD: readpass.c,v 1.57 2019/11/15 00:32:40 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -225,8 +225,9 @@
 		free(prompt);
 		return NULL;
 	}
-	if (getenv("DISPLAY") == NULL ||
-	    (askpass = getenv("SSH_ASKPASS")) == NULL || *askpass == '\0') {
+	if ((askpass = getenv("SSH_ASKPASS")) == NULL)
+		askpass = _PATH_SSH_ASKPASS_DEFAULT;
+	if (getenv("DISPLAY") == NULL || *askpass == '\0') {
 		debug3("%s: cannot notify", __func__);
 		free(prompt);
 		return NULL;