- Merged OpenBSD CVS changes:

   - [auth-krb4.c auth-passwd.c auth-skey.c ssh.
     move skey-auth from auth-passwd.c to auth-s
   - [auth-rsa.c]
     warn only about mismatch if key is _used_
     warn about keysize-mismatch with log() not
     channels.c readconf.c readconf.h ssh.c ssh.
     ports are u_short
   - [hostfile.c]
     indent, shorter warning
   - [nchan.c]
     use error() for internal errors
   - [packet.c]
     set loglevel for SSH_MSG_DISCONNECT to log(
     serverloop.c
     indent
   - [ssh-add.1 ssh-add.c ssh.h]
     document , reasonable default
   - [ssh.1]
     CheckHostIP is not available for connects v
   - [sshconnect.c]
     typo
     easier to read client code for passwd and s
     turn of checkhostip for proxy connects, sin

1 files changed, 7 insertions, 3 deletions

diff --git a/ssh-add.c b/ssh-add.c
index 2d0dad400..f01cca5c8 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -7,7 +7,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: ssh-add.c,v 1.15 1999/11/25 01:31:26 damien Exp $");
+RCSID("$Id: ssh-add.c,v 1.16 1999/12/06 00:47:29 damien Exp $");
 
 #include "rsa.h"
 #include "ssh.h"
@@ -106,8 +106,12 @@ add_file(AuthenticationConnection *ac, const char *filename)
         }
         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);