===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-add.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/usr.bin/ssh/ssh-add.c	1999/11/24 16:13:45	1.14
+++ src/usr.bin/ssh/ssh-add.c	1999/12/02 20:05:40	1.15
@@ -7,7 +7,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: ssh-add.c,v 1.14 1999/11/24 16:13:45 markus Exp $");
+RCSID("$Id: ssh-add.c,v 1.15 1999/12/02 20:05:40 markus Exp $");
 
 #include "rsa.h"
 #include "ssh.h"
@@ -100,8 +100,12 @@
 	}
 	RSA_free(public_key);
 
-	if (!interactive && getenv("DISPLAY"))
-		askpass = getenv("SSH_ASKPASS");
+	if (!interactive && getenv("DISPLAY")) {
+		if (getenv(SSH_ASKPASS_ENV))
+			askpass = getenv(SSH_ASKPASS_ENV);
+		else
+			askpass = SSH_ASKPASS_DEFAULT;
+	}
 
 	/* At first, try empty passphrase */
 	success = load_private_key(filename, "", key, &comment);