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

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  1ed7315ea8e458a1a606eb97894a7b5ba000cd94 (commit)
       via  47b270c3f83a86c3a6f4c3ae92a04c308ded9290 (commit)
      from  cc2da9736c8d766a27444acc84513fb0fa62a777 (commit)

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


- Log -----------------------------------------------------------------
commit 1ed7315ea8e458a1a606eb97894a7b5ba000cd94
Merge: 47b270c3f83a86c3a6f4c3ae92a04c308ded9290 cc2da9736c8d766a27444acc84513fb0fa62a777
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Dec 1 13:45:26 2008 -0800

    Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test

commit 47b270c3f83a86c3a6f4c3ae92a04c308ded9290
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 1 13:44:40 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 4ad94b5..d475165 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -4951,7 +4951,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),
@@ -4961,6 +4965,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