- Merged OpenBSD CVS changes:

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index 2ade9c23054e744b2d04e089a4e1900a4c8af1c7..d81510e1d63b64cec91da3f5eb4f39cdc2a12d28 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -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);