summaryrefslogtreecommitdiff
path: root/source3/smbd/close.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-03-10 21:43:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:58 -0500
commit95e68fa7f8c109204b3ddaeb530e192c71b40e58 (patch)
treecc0277ddadbfbb929bec2adc254554ca798cfa14 /source3/smbd/close.c
parent82379c7bd1827601630da120f5b5ebb9061ce2b5 (diff)
downloadsamba-95e68fa7f8c109204b3ddaeb530e192c71b40e58.tar.gz
samba-95e68fa7f8c109204b3ddaeb530e192c71b40e58.tar.bz2
samba-95e68fa7f8c109204b3ddaeb530e192c71b40e58.zip
r5731: Get delayed write semantics closer to W2K3. We need to store 2 times.
This may fix bug #2382. Jeremy. (This used to be commit a27c351e6beafc6609790a9bb9a3d0a1331e8f35)
Diffstat (limited to 'source3/smbd/close.c')
-rw-r--r--source3/smbd/close.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 4445f2516b..b3244432ff 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -260,8 +260,10 @@ with error %s\n", fsp->fsp_name, strerror(errno) ));
* Ensure pending modtime is set after close.
*/
- if(fsp->pending_modtime) {
+ if(fsp->pending_modtime && fsp->pending_modtime_owner) {
set_filetime(conn, fsp->fsp_name, fsp->pending_modtime);
+ } else if (fsp->last_write_time) {
+ set_filetime(conn, fsp->fsp_name, fsp->last_write_time);
}
DEBUG(2,("%s closed file %s (numopen=%d) %s\n",