Re-arrange create_file() parameters

This changes them to be a bit closer to open_file_ntcreate and thus provides
less surprises to developers

diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index fb85a67d0a0727cf4f1a2a96422a6c84491272b7..01ac1abeb0a98191ea08966d2ef663374685d759 100644 (file)
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -498,8 +498,8 @@ void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
        }
 
        status = create_file(conn, req, root_dir_fid, fname, flags,
-                            access_mask, file_attributes, share_access,
-                            create_disposition, create_options,
+                            access_mask, share_access, create_disposition,
+                            create_options, file_attributes,
                             allocation_size, NULL, NULL,
                             &fsp, &info, &oplock_granted, &sbuf);
 
@@ -942,8 +942,8 @@ static void call_nt_transact_create(connection_struct *conn,
        }
 
        status = create_file(conn, req, root_dir_fid, fname, flags,
-                            access_mask, file_attributes, share_access,
-                            create_disposition, create_options,
+                            access_mask, share_access, create_disposition,
+                            create_options, file_attributes,
                             allocation_size, sd, ea_list,
                             &fsp, &info, &oplock_granted, &sbuf);
 

diff --git a/source/smbd/open.c b/source/smbd/open.c
index f4c3791b436b326e9178cb45dbc04dd429cf6f7c..f555aeccb382398ecb3019adcf79c69a29aa694c 100644 (file)
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -2450,10 +2450,10 @@ NTSTATUS create_file(connection_struct *conn,
                     const char *fname,
                     uint32_t flags,
                     uint32_t access_mask,
-                    uint32_t file_attributes,
                     uint32_t share_access,
                     uint32_t create_disposition,
                     uint32_t create_options,
+                    uint32_t file_attributes,
                     SMB_BIG_UINT allocation_size,
                     struct security_descriptor *sd,
                     struct ea_list *ea_list,