[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  2f09516... Fix explicit set of write time on close. Jeremy.
      from  7f9fe12... Get closer to an accurate model of Windows timestamp changes. "Normal" non truncate writes always cause the timestamp to be set on close. Once a close is done on a handle this can reset the sticky write time to current time also. Updated smbtorture4 confirms this. Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2f09516a6be67d3e51ffc611ae2daa3210f07cd8
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 5 17:12:11 2009 -0800

    Fix explicit set of write time on close.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/close.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index c1623ce..0f1bd90 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -299,7 +299,11 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
 		DEBUG(10,("close_remove_share_mode: update_write_time_on_close "
 			"set for file %s\n",
 			fsp_str_dbg(fsp)));
-		set_close_write_time(lck, fsp, timespec_current());
+		if (null_timespec(fsp->close_write_time)) {
+			set_close_write_time(lck, fsp, timespec_current());
+		} else {
+			set_close_write_time(lck, fsp, fsp->close_write_time);
+		}
 	}
 
 	if (!del_share_mode(lck, fsp)) {


-- 
Samba Shared Repository