diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-06-12 12:54:11 -0700 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-06-12 16:14:50 -0700 |
| commit | 04afa4b6b50f3a23a1872983c75653dc5f670279 (patch) | |
| tree | 05666ff5f2e91db0e49d00a111f2307e8c464850 /source3/modules | |
| parent | 9d7c4ad7482d0c5cff6d15324f82767c851bbf43 (diff) | |
| download | samba-04afa4b6b50f3a23a1872983c75653dc5f670279.tar.gz samba-04afa4b6b50f3a23a1872983c75653dc5f670279.tar.bz2 samba-04afa4b6b50f3a23a1872983c75653dc5f670279.zip | |
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_default.c | 14 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 20 |
2 files changed, 13 insertions, 21 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 4368dcd7da..28adce5768 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -228,8 +228,7 @@ static int vfswrap_open(vfs_handle_struct *handle, const char *fname, static NTSTATUS vfswrap_create_file(vfs_handle_struct *handle, struct smb_request *req, uint16_t root_dir_fid, - const char *fname, - uint32_t create_file_flags, + struct smb_filename *smb_fname, uint32_t access_mask, uint32_t share_access, uint32_t create_disposition, @@ -240,15 +239,14 @@ static NTSTATUS vfswrap_create_file(vfs_handle_struct *handle, struct security_descriptor *sd, struct ea_list *ea_list, files_struct **result, - int *pinfo, - SMB_STRUCT_STAT *psbuf) + int *pinfo) { - return create_file_default(handle->conn, req, root_dir_fid, fname, - create_file_flags, access_mask, share_access, + return create_file_default(handle->conn, req, root_dir_fid, smb_fname, + access_mask, share_access, create_disposition, create_options, file_attributes, oplock_request, - allocation_size, sd, ea_list, result, pinfo, - psbuf); + allocation_size, sd, ea_list, result, + pinfo); } static int vfswrap_close(vfs_handle_struct *handle, files_struct *fsp) diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index bbcb7b3364..e2d08b440f 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -115,8 +115,7 @@ static int smb_full_audit_open(vfs_handle_struct *handle, static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle, struct smb_request *req, uint16_t root_dir_fid, - const char *fname, - uint32_t create_file_flags, + struct smb_filename *smb_fname, uint32_t access_mask, uint32_t share_access, uint32_t create_disposition, @@ -127,8 +126,7 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle, struct security_descriptor *sd, struct ea_list *ea_list, files_struct **result, - int *pinfo, - SMB_STRUCT_STAT *psbuf); + int *pinfo); static int smb_full_audit_close(vfs_handle_struct *handle, files_struct *fsp); static ssize_t smb_full_audit_read(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n); @@ -1197,8 +1195,7 @@ static int smb_full_audit_open(vfs_handle_struct *handle, static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle, struct smb_request *req, uint16_t root_dir_fid, - const char *fname, - uint32_t create_file_flags, + struct smb_filename *smb_fname, uint32_t access_mask, uint32_t share_access, uint32_t create_disposition, @@ -1209,8 +1206,7 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle, struct security_descriptor *sd, struct ea_list *ea_list, files_struct **result_fsp, - int *pinfo, - SMB_STRUCT_STAT *psbuf) + int *pinfo) { NTSTATUS result; @@ -1218,8 +1214,7 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle, handle, /* handle */ req, /* req */ root_dir_fid, /* root_dir_fid */ - fname, /* fname */ - create_file_flags, /* create_file_flags */ + smb_fname, /* fname */ access_mask, /* access_mask */ share_access, /* share_access */ create_disposition, /* create_disposition*/ @@ -1230,11 +1225,10 @@ static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle, sd, /* sd */ ea_list, /* ea_list */ result_fsp, /* result */ - pinfo, /* pinfo */ - psbuf); /* psbuf */ + pinfo); /* pinfo */ do_log(SMB_VFS_OP_CREATE_FILE, (NT_STATUS_IS_OK(result)), handle, "0x%x|%s", - access_mask, fname); + access_mask, smb_fname_str_dbg(smb_fname)); return result; } |