summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@sernet.de>2007-12-07 12:39:30 +0100
committerVolker Lendecke <vl@sernet.de>2007-12-07 14:05:06 +0100
commitce535b4dd8c410d91f9c0fa2d1d973b4326af64d (patch)
tree4dd3ba18b2ab78a88285609cf1c9f21d37a61a1b /source3
parentc55e44b6a7c8ca569010ddd7596ba05239c4d673 (diff)
downloadsamba-ce535b4dd8c410d91f9c0fa2d1d973b4326af64d.tar.gz
samba-ce535b4dd8c410d91f9c0fa2d1d973b4326af64d.tar.bz2
samba-ce535b4dd8c410d91f9c0fa2d1d973b4326af64d.zip
More parameter shuffling
(This used to be commit 8f70f691ffa3e171a73d04a1c867aa6fca4d4583)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/nttrans.c8
-rw-r--r--source3/smbd/open.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 01ac1abeb0..a8afd580b3 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/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/source3/smbd/open.c b/source3/smbd/open.c
index f555aeccb3..11dff4dfe5 100644
--- a/source3/smbd/open.c
+++ b/source3/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,