diff options
| author | Jeremy Allison <jra@samba.org> | 2009-11-05 17:40:01 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-11-05 17:40:01 -0800 |
| commit | 0551284dc08eb93ef7b2b2227a45e5ec21d482fb (patch) | |
| tree | 67ed2e7b74e693bca93f1d9143b6099e25d4eccb /source3/smbd/reply.c | |
| parent | 2f09516a6be67d3e51ffc611ae2daa3210f07cd8 (diff) | |
| download | samba-0551284dc08eb93ef7b2b2227a45e5ec21d482fb.tar.gz samba-0551284dc08eb93ef7b2b2227a45e5ec21d482fb.tar.bz2 samba-0551284dc08eb93ef7b2b2227a45e5ec21d482fb.zip | |
Simplify the logic - remove extraneous argument and calls to set_close_write_time().
We were treating a file time set on close as a sticky write time set, and I don't
think it is. I will add a torture test later to RAW-CLOSE to confirm this.
Jeremy.
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 37634acc2c..984cf56c11 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -4646,7 +4646,7 @@ void reply_close(struct smb_request *req) */ t = srv_make_unix_date3(req->vwv+1); - set_close_write_time(NULL, fsp, convert_time_t_to_timespec(t)); + set_close_write_time(fsp, convert_time_t_to_timespec(t)); /* * close_file() returns the unix errno if an error @@ -4723,7 +4723,7 @@ void reply_writeclose(struct smb_request *req) nwritten = write_file(req,fsp,data,startpos,numtowrite); - set_close_write_time(NULL, fsp, mtime); + set_close_write_time(fsp, mtime); /* * More insanity. W2K only closes the file if writelen > 0. @@ -6691,7 +6691,7 @@ NTSTATUS copy_file(TALLOC_CTX *ctx, close_file(NULL, fsp1, NORMAL_CLOSE); /* Ensure the modtime is set correctly on the destination file. */ - set_close_write_time(NULL, fsp2, smb_fname_src->st.st_ex_mtime); + set_close_write_time(fsp2, smb_fname_src->st.st_ex_mtime); /* * As we are opening fsp1 read-only we only expect |