[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3208-g8cb8ab8

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  8cb8ab81678e8fee570f228c3851c384abf54054 (commit)
      from  0ed6d1f02a82c6f5e32a4941f153b601a5256921 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 8cb8ab81678e8fee570f228c3851c384abf54054
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 1 13:44:43 2008 -0800

    s3:smbd: write times should be set on the base file instead of the stream name
    
    metze

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

Summary of changes:
 source/smbd/trans2.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 89a7911..cb7cad1 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -4932,7 +4932,11 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
 			  time_to_asc(convert_timespec_to_time_t(ts[1])) ));
 
 		if (fsp != NULL) {
-			set_sticky_write_time_fsp(fsp, ts[1]);
+			if (fsp->base_fsp) {
+				set_sticky_write_time_fsp(fsp->base_fsp, ts[1]);
+			} else {
+				set_sticky_write_time_fsp(fsp, ts[1]);
+			}
 		} else {
 			set_sticky_write_time_path(conn, fname,
 					    vfs_file_id_from_sbuf(conn, psbuf),
@@ -4942,6 +4946,10 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
 
 	DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n"));
 
+	if (fsp && fsp->base_fsp) {
+		fname = fsp->base_fsp->fsp_name;
+	}
+
 	if(file_ntimes(conn, fname, ts)!=0) {
 		return map_nt_error_from_unix(errno);
 	}


-- 
Samba Shared Repository