r5731: Get delayed write semantics closer to W2K3. We need to store 2 times.

[samba.git] / source3 / smbd / close.c

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 4445f2516bc4eecf0c1bb76cb9c332e30b19fda9..b3244432ff559be4a6146f2aedb017522f663808 100644 (file)
--- 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",