[PATCH] Don't fetch UID/GID for SFTP files



We're currently using the UID/GID provided from the SFTP server, but
this is deprecated in recent sftp drafts [1]. I've attached a patch to a
bug report [2] which removes the UID/GID code, which is also attached to
this email.

[1] http://www.ietf.org/internet-drafts/draft-ietf-secsh-filexfer-12.txt
[2] http://bugzilla.gnome.org/show_bug.cgi?id=346676

-- 
Christian Neumair <chris gnome-de org>
Index: modules/sftp-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/sftp-method.c,v
retrieving revision 1.45
diff -u -p -r1.45 sftp-method.c
--- modules/sftp-method.c	13 May 2006 15:51:58 -0000	1.45
+++ modules/sftp-method.c	12 Jul 2006 20:10:53 -0000
@@ -504,11 +504,16 @@ buffer_read_file_info (Buffer *buf, Gnom
 	}
 	
 	if (flags & SSH2_FILEXFER_ATTR_UIDGID) {
-		info->uid = buffer_read_gint32 (buf);
-		info->gid = buffer_read_gint32 (buf);
-		info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_IDS;	
+		/* Deprecated in recent SFTP drafts, it isn't really useful
+		 * since it doesn't relate to the local UID/GID info.
+		 *
+		 * We skip the buffer, but ignore the contents. */
+		buffer_read_gint32 (buf); /* UID */
+		buffer_read_gint32 (buf); /* GID */
 	}
-	
+
+	/* TODO SSH_FILEXFER_ATTR_OWNERGROUP */
+
 	if (flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
 		info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS;
 		info->permissions = buffer_read_gint32 (buf);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]