smbd: flush pending writetime update when setting timestamps file

Cf the explanations in the previous commits.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14150

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/selftest/knownfail.d/samba3.smb2.timestamps b/selftest/knownfail.d/samba3.smb2.timestamps
deleted file mode 100644 (file)
index 8a52d4a..0000000
--- a/selftest/knownfail.d/samba3.smb2.timestamps
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.smb2.timestamps.delayed-write-vs-setbasic\(.*\)$

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index f809837f1cbfe7b6e871ede8e2dcf9b62c837899..5e2c26693109a68f93edcf5f28a00e50f3c2be17 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -9437,6 +9437,10 @@ void reply_setattrE(struct smb_request *req)
                goto out;
        }
 
+       if (fsp->modified) {
+               trigger_write_time_update_immediate(fsp);
+       }
+
        DEBUG( 3, ( "reply_setattrE %s actime=%u modtime=%u "
               " createtime=%u\n",
                fsp_fnum_dbg(fsp),

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 8000e1ae924e361a9e980f4a165e0c15b0d93d85..5b7333773bbb523e32379c524ca9df8ba1ad8de9 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -7836,8 +7836,15 @@ static NTSTATUS smb_set_file_basic_info(connection_struct *conn,
        DEBUG(10, ("smb_set_file_basic_info: file %s\n",
                   smb_fname_str_dbg(smb_fname)));
 
-       return smb_set_file_time(conn, fsp, smb_fname, &ft,
-                                true);
+       status = smb_set_file_time(conn, fsp, smb_fname, &ft, true);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       if (fsp != NULL && fsp->modified) {
+               trigger_write_time_update_immediate(fsp);
+       }
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
@@ -7874,11 +7881,15 @@ static NTSTATUS smb_set_info_standard(connection_struct *conn,
                return status;
        }
 
-        return smb_set_file_time(conn,
-                                fsp,
-                               smb_fname,
-                               &ft,
-                                true);
+       status = smb_set_file_time(conn, fsp, smb_fname, &ft, true);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       if (fsp != NULL && fsp->modified) {
+               trigger_write_time_update_immediate(fsp);
+       }
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************