summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@sernet.de>2007-12-07 11:58:40 +0100
committerVolker Lendecke <vl@sernet.de>2007-12-07 14:05:05 +0100
commitc55e44b6a7c8ca569010ddd7596ba05239c4d673 (patch)
tree899b53c185c08b99f28ca3fc0a0a0ac0e743be2a /source3/smbd
parent30d31a3f85399042cd7f337c85a261352dd31b09 (diff)
downloadsamba-c55e44b6a7c8ca569010ddd7596ba05239c4d673.tar.gz
samba-c55e44b6a7c8ca569010ddd7596ba05239c4d673.tar.bz2
samba-c55e44b6a7c8ca569010ddd7596ba05239c4d673.zip
Re-arrange create_file() parameters
This changes them to be a bit closer to open_file_ntcreate and thus provides less surprises to developers (This used to be commit d000258b96b9bb714efdfe982947370a6dfb5d55)
Diffstat (limited to 'source3/smbd')
-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 fb85a67d0a..01ac1abeb0 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/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/source3/smbd/open.c b/source3/smbd/open.c
index f4c3791b43..f555aeccb3 100644
--- a/source3/smbd/open.c
+++ b/source3/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,