Re: [patch] Honor the setgid bit on directories

[Sjoerd Simons <sjoerd luon net>]

On Mon, Jan 24, 2005 at 11:22:44AM +0100, Alexander Larsson wrote:
> On Sun, 2005-01-23 at 22:58 +0100, Sjoerd Simons wrote:
> I don't understand this patch:
  ...
> How can this possibly do anything at all?

It can't, i send the wrong patch (dOh).. Correct patch is attached. 

Now if you would excuse me, it's time for me need to crawl back under my rock
and start feeling stupid..

  Sjoerd
-- 
Murphy's Law, that brash proletarian restatement of Godel's Theorem.
		-- Thomas Pynchon, "Gravity's Rainbow"

--- libgnomevfs/gnome-vfs-xfer.c.orig	2005-01-24 13:16:12.000000000 +0100
+++ libgnomevfs/gnome-vfs-xfer.c	2005-01-24 13:16:20.000000000 +0100
@@ -1527,9 +1527,11 @@
 	GnomeVFSResult result;
 	GnomeVFSDirectoryHandle *source_directory_handle;
 	GnomeVFSDirectoryHandle *dest_directory_handle;
+	GnomeVFSFileInfo *target_dir_info;
 
 	source_directory_handle = NULL;
 	dest_directory_handle = NULL;
+	target_dir_info = NULL;
 	
 	result = gnome_vfs_directory_open_from_uri (&source_directory_handle, source_dir_uri, 
 						    GNOME_VFS_FILE_INFO_DEFAULT);
@@ -1563,6 +1565,14 @@
 		return result;
 	}
 
+	target_dir_info = gnome_vfs_file_info_new();
+	result = gnome_vfs_get_file_info_uri(target_dir_uri, target_dir_info,
+                                       GNOME_VFS_FILE_INFO_DEFAULT);
+	if (result != GNOME_VFS_OK) {
+		gnome_vfs_file_info_unref(target_dir_info);
+		target_dir_info = NULL;
+	}
+
 	if (call_progress_with_uris_often (progress, source_dir_uri, target_dir_uri, 
 					   GNOME_VFS_XFER_PHASE_OPENTARGET) != 0) {
 
@@ -1589,6 +1599,9 @@
 				gnome_vfs_file_info_unref (info);	
 				break;
 			}
+			if (target_dir_info && GNOME_VFS_FILE_INFO_SGID(target_dir_info)) {
+				info->gid = target_dir_info->gid;
+			}
 			
 			/* Skip "." and "..".  */
 			if (strcmp (info->name, ".") != 0 && strcmp (info->name, "..") != 0) {
@@ -1650,20 +1663,29 @@
 	gnome_vfs_directory_close (source_directory_handle);
 
 	if (result == GNOME_VFS_OK) {
+		GnomeVFSFileInfo *info;
+		info = gnome_vfs_file_info_new ();
 		/* FIXME the modules should ignore setting of permissions if
 		 * "valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS" is clear
 		 * for now, make sure permissions aren't set to 000
 		 */
-
+		gnome_vfs_file_info_copy(source_file_info, info);
+		if (target_dir_info && GNOME_VFS_FILE_INFO_SGID(target_dir_info)) {
+			info->gid = target_dir_info->gid;
+		}
 		if ((source_file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS) != 0) {
 			/* Call this separately from the time one, since one of them may fail,
 			   making the other not run. */
-			gnome_vfs_set_file_info_uri (target_dir_uri, source_file_info, 
+			gnome_vfs_set_file_info_uri (target_dir_uri, info, 
 						     GNOME_VFS_SET_FILE_INFO_OWNER | GNOME_VFS_SET_FILE_INFO_PERMISSIONS);
 		}
 		
 		/* Call this last so nothing else changes the times */
-		gnome_vfs_set_file_info_uri (target_dir_uri, source_file_info, GNOME_VFS_SET_FILE_INFO_TIME);
+		gnome_vfs_set_file_info_uri (target_dir_uri, info, GNOME_VFS_SET_FILE_INFO_TIME);
+		gnome_vfs_file_info_unref(info);
+	}
+	if (target_dir_info) {
+		gnome_vfs_file_info_unref(target_dir_info);
 	}
 
 	return result;
@@ -1713,6 +1735,17 @@
 			((GnomeVFSURI *)target_item->data);
 
 		if (result == GNOME_VFS_OK) {
+			GnomeVFSFileInfo *target_dir_info;
+			/* get target_dir URI and file info to take care of SGID */
+			target_dir_info = gnome_vfs_file_info_new ();
+			result = gnome_vfs_get_file_info_uri (target_dir_uri, target_dir_info,
+																						GNOME_VFS_FILE_INFO_DEFAULT);
+			if (result == GNOME_VFS_OK && GNOME_VFS_FILE_INFO_SGID(target_dir_info)) {
+				info->gid = target_dir_info->gid;
+			}
+			gnome_vfs_file_info_unref (target_dir_info);
+			result = GNOME_VFS_OK;
+
 			/* optionally keep trying until we hit a unique target name */
 			for (count = 1; ; count++) {
 				GnomeVFSXferOverwriteMode overwrite_mode_abort;