Released 1.9

libfuse · Dec 11, 2007 · ad9f0cf · ad9f0cf
1 parent 501b9f7
commit ad9f0cf
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,16 @@
-2007-12-10  Miklos Szeredi <miklos@szeredi.h>u
+2007-12-11  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Released 1.9
+
+2007-12-11  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Fill in st_ctime attribute with st_mtime, instead of leaving it
+	zero
+
+	* Check for OpenSSH version >= 4.4, and if found, don't build the
+	sshnodelay.so workaround
+
+2007-12-10  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Fix crash on writing files, caused by missing locking around
 	sshfs_file_get()

diff --git a/NEWS b/NEWS
@@ -1,3 +1,9 @@
+What is new in 1.9
+------------------
+
+* Fix a serious bug, that could result in sshfs hanging, crashing, or
+  reporting out-of-memory
+
 What is new in 1.8
 ------------------
 

diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,9 @@
-AC_INIT(sshfs-fuse, 1.8)
+AC_INIT(sshfs-fuse, 1.9)
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 CFLAGS="$CFLAGS -Wall -W"
 LIBS=
 AC_SEARCH_LIBS(dlsym, [dl])
@@ -13,6 +14,22 @@ LIBS=
 AC_ARG_ENABLE(sshnodelay,
 	[  --disable-sshnodelay    Don't compile NODELAY workaround for ssh])
 
+if test -z "$enable_sshnodelay"; then
+	AC_MSG_CHECKING([OpenSSH version])
+	[eval `ssh -V 2>&1 | sed -n 's/^OpenSSH_\([1-9][0-9]*\)\.\([0-9][0-9]*\).*/ssh_major=\1 ssh_minor=\2/p'`]
+	if test "x$ssh_major" != x -a "x$ssh_minor" != x; then
+		if test $ssh_major -gt 4 -o \( $ssh_major = 4 -a $ssh_minor -ge 4 \); then
+			AC_MSG_RESULT([$ssh_major.$ssh_minor >= 4.4, disabling NODELAY workaround])
+			enable_sshnodelay=no
+		else
+			AC_MSG_RESULT([$ssh_major.$ssh_minor < 4.4, enabling NODELAY workaround])
+			enable_sshnodelay=yes
+		fi
+	else
+		AC_MSG_RESULT([not found])
+	fi
+fi
+
 if test "$enable_sshnodelay" != "no"; then
 	AC_DEFINE(SSH_NODELAY_WORKAROUND, 1, [Compile ssh NODELAY workaround])
 fi

diff --git a/sshfs.c b/sshfs.c
@@ -604,7 +604,7 @@ static int buf_get_attrs(struct buffer *buf, struct stat *stbuf, int *flagsp)
 	stbuf->st_uid = uid;
 	stbuf->st_gid = gid;
 	stbuf->st_atime = atime;
-	stbuf->st_mtime = mtime;
+	stbuf->st_ctime = stbuf->st_mtime = mtime;
 	return 0;
 }