aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sshfs.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 60122e8..c4fe578 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-28 Miklos Szeredi <miklos@szeredi.hu>
+
+ * Don't set DISPLAY environment variable to "", because it breaks
+ ssh-askpass. Make nodelaysrv_workaround default to off, because
+ with this change it may have security implications.
+
2007-02-19 Miklos Szeredi <miklos@szeredi.hu>
* OpenSSH sftp-server can read requests faster, than it processes
diff --git a/sshfs.c b/sshfs.c
index 202c6b2..38176e3 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -712,7 +712,6 @@ static int start_ssh(void)
if (sshfs.nodelaysrv_workaround) {
/* Hack to work around missing TCP_NODELAY setting in sshd */
sshfs.ssh_args.argv[1] = "-X";
- setenv("DISPLAY", "", 1);
}
devnull = open("/dev/null", O_WRONLY);
@@ -2609,7 +2608,7 @@ int main(int argc, char *argv[])
sshfs.blksize = 4096;
sshfs.max_read = 65536;
sshfs.nodelay_workaround = 1;
- sshfs.nodelaysrv_workaround = 1;
+ sshfs.nodelaysrv_workaround = 0;
sshfs.rename_workaround = 0;
sshfs.truncate_workaround = 0;
sshfs.buflimit_workaround = 1;