Merge remote-tracking branch 'upstream/master'

Conflicts:
	ChangeLog
	configure.ac
	sshfs.1.in
	sshfs.c

1 files changed, 5 insertions, 1 deletions

diff --git a/sshfs.c b/sshfs.c
index 5658412..f0a1608 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -1697,7 +1697,7 @@ static int sftp_check_root(const char *base_path)
 	buf_init(&buf, 0);
 	buf_add_string(&buf, remote_dir);
 	buf_to_iov(&buf, &iov[0]);
-	if (sftp_send_iov(SSH_FXP_STAT, id, iov, 1) == -1)
+	if (sftp_send_iov(SSH_FXP_LSTAT, id, iov, 1) == -1)
 		goto out;
 	buf_clear(&buf);
 	if (sftp_read(&type, &buf) == -1)
@@ -4019,6 +4019,10 @@ int main(int argc, char *argv[])
 			exit(1);
 		}
 
+		/*
+		 * FIXME: trim $PATH so it doesn't contain anything inside the
+		 * mountpoint, which would deadlock.
+		 */
 		res = ssh_connect();
 		if (res == -1) {
 			fuse_unmount(mountpoint, ch);