Do not clean DISPLAY unconditionally

diff --git a/main.c b/main.c
index 9d764e16b6eb4c583dfc74de26994305da80b35a..ccad28a1e9554a7be37edb33a729ca915a4f902d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1743,7 +1743,9 @@ int main(int argc,char *argv[])
        our_gid = MY_GID();
        am_root = our_uid == ROOT_UID;
 
        our_gid = MY_GID();
        am_root = our_uid == ROOT_UID;
 

-       unset_env_var("DISPLAY");
+       // DISPLAY should not be emptied unconditionally
+       if (!getenv("SSH_ASKPASS"))
+               unset_env_var("DISPLAY");

 
 #if defined USE_OPENSSL && defined SET_OPENSSL_CONF
 #define TO_STR2(x) #x
 
 #if defined USE_OPENSSL && defined SET_OPENSSL_CONF
 #define TO_STR2(x) #x