diff options
| author | Ralph Boehme <slow@samba.org> | 2019-05-17 11:54:10 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-06-21 07:56:18 +0000 |
| commit | 1efc046ceffec570914fafcc538e2b03c4228dec (patch) | |
| tree | 4b75e0eeb451f5ed68c4ae78c48ed1178950cc81 | |
| parent | b5275f407f614edf381fe80e4d62399f0f7581ba (diff) | |
| download | samba-1efc046ceffec570914fafcc538e2b03c4228dec.tar.gz | |
vfs_fruit: pass handle to ad_convert_xattr()
On the course of removing ad_handle from struct adouble, step 7.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13968
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit fd2f4cf828ee4c31e3b5a27a79d3a0ee12a5877a)
| -rw-r--r-- | source3/modules/vfs_fruit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index e3402d22082..108986727ee 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -1057,7 +1057,8 @@ static bool ad_convert_move_reso(struct adouble *ad, return true; } -static bool ad_convert_xattr(struct adouble *ad, +static bool ad_convert_xattr(vfs_handle_struct *handle, + struct adouble *ad, const struct smb_filename *smb_fname, bool *converted_xattr) { @@ -1108,7 +1109,7 @@ static bool ad_convert_xattr(struct adouble *ad, files_struct *fsp = NULL; ssize_t nwritten; - status = string_replace_allocate(ad->ad_handle->conn, + status = string_replace_allocate(handle->conn, e->adx_name, string_replace_cmaps, talloc_tos(), @@ -1145,7 +1146,7 @@ static bool ad_convert_xattr(struct adouble *ad, DBG_DEBUG("stream_name: %s\n", smb_fname_str_dbg(stream_name)); status = SMB_VFS_CREATE_FILE( - ad->ad_handle->conn, /* conn */ + handle->conn, /* conn */ NULL, /* req */ 0, /* root_dir_fid */ stream_name, /* fname */ @@ -1468,7 +1469,7 @@ static int ad_convert(struct vfs_handle_struct *handle, return 0; } - ok = ad_convert_xattr(ad, smb_fname, &converted_xattr); + ok = ad_convert_xattr(handle, ad, smb_fname, &converted_xattr); if (!ok) { ret = -1; goto done; |