More parameter shuffling

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

diff --git a/source/smbd/open.c b/source/smbd/open.c
index f555aeccb382398ecb3019adcf79c69a29aa694c..11dff4dfe5e388f0d1a7b2bf82711e49b408650d 100644 (file)
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -2448,12 +2448,12 @@ NTSTATUS create_file(connection_struct *conn,
                     struct smb_request *req,
                     uint16_t root_dir_fid,
                     const char *fname,
-                    uint32_t flags,
                     uint32_t access_mask,
                     uint32_t share_access,
                     uint32_t create_disposition,
                     uint32_t create_options,
                     uint32_t file_attributes,
+                    uint32_t flags,
                     SMB_BIG_UINT allocation_size,
                     struct security_descriptor *sd,
                     struct ea_list *ea_list,