Attachment 4388 Details for Bug 6520 – Replacement patch for 3.4.0 and master

[patch] Replacement patch for 3.4.0 and master

modtime-unix.patch (text/plain), 1.81 KB, created by Jeremy Allison on 2009-07-01 16:32:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2009-07-01 16:32:19 UTC

Size: 1.81 KB

patch

obsolete

>diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
>index 40b4701..cae13df 100644
>--- a/source3/smbd/trans2.c
>+++ b/source3/smbd/trans2.c
>@@ -4943,7 +4943,7 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
> 
> 	if (setting_write_time) {
> 		/*
>-		 * This was a setfileinfo on an open file.
>+		 * This was a Windows setfileinfo on an open file.
> 		 * NT does this a lot. We also need to 
> 		 * set the time here, as it can be read by 
> 		 * FindFirst/FindNext and with the patch for bug #2045
>@@ -6044,6 +6044,9 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn,
> 	NTSTATUS status = NT_STATUS_OK;
> 	bool delete_on_fail = False;
> 	enum perm_type ptype;
>+	files_struct *all_fsps = NULL;
>+	bool modify_mtime = true;
>+	struct file_id id;
> 
> 	ZERO_STRUCT(ft);
> 
>@@ -6192,13 +6195,38 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
> 	}
> 
> 	/* Deal with any time changes. */
>+	id = vfs_file_id_from_sbuf(conn, psbuf);
>+	for(all_fsps = file_find_di_first(id); all_fsps;
>+			all_fsps = file_find_di_next(all_fsps)) {
>+		/*
>+		 * We're setting the time explicitly for UNIX.
>+		 * Cancel any pending changes over all handles.
>+		 */
>+		all_fsps->update_write_time_on_close = false;
>+		TALLOC_FREE(all_fsps->update_write_time_event);
>+	}
> 
>-	return smb_set_file_time(conn,
>+	/*
>+	 * Override the "setting_write_time"
>+	 * parameter here as it almost does what
>+	 * we need. Just remember if we modified
>+	 * mtime and send the notify ourselves.
>+	 */
>+	if (null_timespec(ft.mtime)) {
>+		modify_mtime = false;
>+	}
>+
>+	status = smb_set_file_time(conn,
> 				fsp,
> 				fname,
> 				psbuf,
> 				&ft,
>-				true);
>+				false);
>+	if (modify_mtime) {
>+		notify_fname(conn, NOTIFY_ACTION_MODIFIED,
>+			FILE_NOTIFY_CHANGE_LAST_WRITE, fname);
>+	}
>+	return status;
> }
> 
> /****************************************************************************

Actions: View

Attachments on bug 6520: 4369 | 4370 | 4378 | 4379 | 4384 | 4388 | 4389 | 4391