sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3: lib: adouble: Add struct files_struct *dirfsp parameter to ad_convert().

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2019-09-13 14:52:00 -07:00 committed by Ralph Boehme
parent 6a55e676aa
commit 7691ce3a4b
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/lib/adouble.c
View File

@ -1387,9 +1387,10 @@ static bool ad_convert_delete_adfile(vfs_handle_struct *handle,
* otherwise
**/
int ad_convert(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname,
const char *catia_mappings,
uint32_t flags)
struct files_struct *dirfsp,
const struct smb_filename *smb_fname,
const char *catia_mappings,
uint32_t flags)
{
struct adouble *ad = NULL;
bool ok;

7
source3/lib/adouble.h
View File

@ -154,9 +154,10 @@ char *ad_get_entry(const struct adouble *ad, int eid);
int ad_getdate(const struct adouble *ad, unsigned int dateoff, uint32_t *date);
int ad_setdate(struct adouble *ad, unsigned int dateoff, uint32_t date);
int ad_convert(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname,
const char *catia_mappings,
uint32_t flags);
struct files_struct *dirfsp,
const struct smb_filename *smb_fname,
const char *catia_mappings,
uint32_t flags);
bool ad_unconvert(TALLOC_CTX *mem_ctx,
struct vfs_handle_struct *handle,
const char *catia_mappings,

7
source3/modules/vfs_fruit.c
View File

@ -4081,6 +4081,7 @@ static NTSTATUS fruit_create_file(vfs_handle_struct *handle,
}
ret = ad_convert(handle,
handle->conn->cwd_fsp,
smb_fname,
macos_string_replace_map,
conv_flags);
@ -4194,7 +4195,11 @@ static NTSTATUS fruit_readdir_attr(struct vfs_handle_struct *handle,
conv_flags |= AD_CONV_DELETE;
}
ret = ad_convert(handle, fname, macos_string_replace_map, conv_flags);
ret = ad_convert(handle,
handle->conn->cwd_fsp,
fname,
macos_string_replace_map,
conv_flags);
if (ret != 0) {
DBG_ERR("ad_convert() failed\n");
return NT_STATUS_UNSUCCESSFUL;