s3/smbd: SMB_VFS_SET_DOS_ATTRIBUTES -> SMB_VFS_FSET_DOS_ATTRIBUTES

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index aaa0924cb9dbb70a97a9c6a7330b926cd8d3adfb..a9d73e5f34b9a90e569b572d9ee65d05a3ac999b 100644 (file)
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -967,8 +967,15 @@ int file_set_dosmode(connection_struct *conn,
        else
                dosmode &= ~FILE_ATTRIBUTE_DIRECTORY;
 
-       /* Store the DOS attributes in an EA by preference. */
-       status = SMB_VFS_SET_DOS_ATTRIBUTES(conn, smb_fname, dosmode);
+       if (smb_fname->fsp != NULL) {
+               /* Store the DOS attributes in an EA by preference. */
+               status = SMB_VFS_FSET_DOS_ATTRIBUTES(conn,
+                                                    smb_fname->fsp,
+                                                    dosmode);
+       } else {
+               status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
        if (NT_STATUS_IS_OK(status)) {
                if (!newfile) {
                        notify_fname(conn, NOTIFY_ACTION_MODIFIED,
@@ -1323,6 +1330,11 @@ NTSTATUS set_create_timespec_ea(connection_struct *conn,
        dosmode = fdos_mode(psmb_fname->fsp);
 
        smb_fname->st.st_ex_btime = create_time;
+       /*
+        * ensure if we pass fsp around we can get the create time
+        * from fsp->fsp_name
+        */
+       smb_fname->fsp->fsp_name->st.st_ex_btime = create_time;
 
        ret = file_set_dosmode(conn, smb_fname, dosmode, NULL, false);
        if (ret == -1) {