Released 2.4

otherwise, other local users could change the mapping, and gain access
to things they shouldn't

ChangeLog

@@ -1,3 +1,55 @@
+2012-03-08  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Released 2.4
+
+2012-03-08  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Make sure idmap files aren't writable by others otherwise, other
+	local users could change the mapping, and gain access to things
+	they shouldn't.  Patch by Mike Kelly
+
+2012-02-08  Chris Wolfe <cwolfe@chromium.org>
+
+	* Add -o slave. This option routes the sftp communication over stdin
+	and stdout, bypassing SSH and network.
+
+2011-12-16  Mike Kelly <mike@pair.com>
+
+	* Add -o idmap=file, -o uidmap=FILE, -o gidmap=FILE. These options
+	allow you to create a pair of local files, similar to /etc/passwd or
+	/etc/group files from the remote server, and use those to remap all
+	the given UIDs/GIDs.
+
+2011-11-25  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Make chown respect the UID mapping policy.  Reported and tested
+	by Vivenzio Pagliari
+
+2011-11-16  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Submit max 32k reads and writes to the sftp server.  Also don't
+	limit the kernel to 64k reads and writes, rather split into 32k
+	sized chunks and send them to the server all at once.  This is
+	more efficient and less demanding from the server.  Reported by
+	Ludovic Courtès.  Fix suggested by Niels Möller
+
+2011-11-14  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Fix double free if reconnection races with request sending.
+	Patch by E. Kuemmerle
+
+	* Add locking around modifver and connver
+
+2011-10-21  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Remove "-oPreferredAuthentications" from ssh options if the
+	"password_stdin" option is used.  Reported by E. Kuemmerle
+
+2011-08-24  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Add "-oworkaround=fstat" for SFTP servers which don't support
+	the FSTAT message.  Patch by: Percy Jahn
+
 2011-07-01  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Released 2.3

cache.c

@@ -164,7 +164,6 @@ static struct node *cache_get(const char *path)
 void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr)
 {
 	struct node *node;
-	time_t now;
 
 	if (!cache.on)
 		return;
@@ -172,7 +171,6 @@ void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr)
 	pthread_mutex_lock(&cache.lock);
 	if (wrctr == cache.write_ctr) {
 		node = cache_get(path);
-		now = time(NULL);
 		node->stat = *stbuf;
 		node->stat_valid = time(NULL) + cache.stat_timeout;
 		if (node->stat_valid > node->valid)
@@ -185,11 +183,9 @@ void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr)
 static void cache_add_dir(const char *path, char **dir)
 {
 	struct node *node;
-	time_t now;
 
 	pthread_mutex_lock(&cache.lock);
 	node = cache_get(path);
-	now = time(NULL);
 	g_strfreev(node->dir);
 	node->dir = dir;
 	node->dir_valid = time(NULL) + cache.dir_timeout;
@@ -209,11 +205,9 @@ static size_t my_strnlen(const char *s, size_t maxsize)
 static void cache_add_link(const char *path, const char *link, size_t size)
 {
 	struct node *node;
-	time_t now;
 
 	pthread_mutex_lock(&cache.lock);
 	node = cache_get(path);
-	now = time(NULL);
 	g_free(node->link);
 	node->link = g_strndup(link, my_strnlen(link, size-1));
 	node->link_valid = time(NULL) + cache.link_timeout;

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(sshfs-fuse, 2.3)
+AC_INIT(sshfs-fuse, 2.4)
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 

sshfs.1

@@ -102,6 +102,29 @@ no translation of the ID space (default)
 .TP
 user
 only translate UID of connecting user
+.TP
+file
+translate UIDs/GIDs based upon the contents of \fBuidfile \fR and
+\fBgidfile\fR
+.RE
+.TP
+\fB\-o\fR uidfile=FILE
+file containing username:uid mappings for \fBidmap=file\fR
+.RE
+.TP
+\fB\-o\fR gidfile=FILE
+file containing groupname:gid mappings for \fBidmap=file\fR
+.RE
+.TP
+\fB\-o\fR nomap=TYPE
+with idmap=file, how to handle missing mappings
+.RS 8
+.TP
+ignore
+don't do any re-mapping
+.TP
+error
+return an error (default)
 .RE
 .TP
 \fB\-o\fR ssh_command=CMD
@@ -115,6 +138,8 @@ path to sftp server or subsystem (default: sftp)
 .TP
 \fB\-o\fR directport=PORT
 directly connect to PORT bypassing ssh
+\fB\-o\fR slave
+communicate over stdin and stdout bypassing network
 .TP
 \fB\-o\fR transform_symlinks
 transform absolute symlinks to relative
@@ -150,7 +175,7 @@ allow access to root
 \fB\-o\fR nonempty
 allow mounts over non\-empty file/dir
 .HP
-\fB\-o\fR default_permissions 
+\fB\-o\fR default_permissions
 enable permission checking by kernel
 .TP
 \fB\-o\fR fsname=NAME
@@ -225,7 +250,7 @@ perform reads asynchronously (default)
 \fB\-o\fR sync_read
 perform reads synchronously
 .SS "Module options:"
-.TP 
+.TP
 [subdir]
 .TP
 \fB\-o\fR subdir=DIR
@@ -233,7 +258,7 @@ prepend this directory to all paths (mandatory)
 .TP
 \fB\-o\fR [no]rellinksa
 transform absolute symlinks to relative
-.TP 
+.TP
 [iconv]
 .TP
 \fB\-o\fR from_code=CHARSET