diff options
| author | Ralph Boehme <slow@samba.org> | 2019-05-17 12:02:46 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-06-21 07:56:18 +0000 |
| commit | b50f2ad9919120f3a6ff556ac0694b12fc6fb88c (patch) | |
| tree | 86dcc7e6d92023a567ffebfe1709ae25530a9a65 | |
| parent | 1efc046ceffec570914fafcc538e2b03c4228dec (diff) | |
| download | samba-b50f2ad9919120f3a6ff556ac0694b12fc6fb88c.tar.gz | |
vfs_fruit: pass handle to ad_convert_blank_rfork()
On the course of removing ad_handle from struct adouble, step 8.
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 adc7ac38b849b4dce4a85fd6442c8d4b9da57686)
| -rw-r--r-- | source3/modules/vfs_fruit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 108986727ee..ba978d14509 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -1345,7 +1345,8 @@ static bool ad_convert_truncate(struct adouble *ad, return true; } -static bool ad_convert_blank_rfork(struct adouble *ad, +static bool ad_convert_blank_rfork(vfs_handle_struct *handle, + struct adouble *ad, bool *blank) { struct fruit_config_data *config = NULL; @@ -1358,7 +1359,7 @@ static bool ad_convert_blank_rfork(struct adouble *ad, *blank = false; - SMB_VFS_HANDLE_GET_DATA(ad->ad_handle, config, + SMB_VFS_HANDLE_GET_DATA(handle, config, struct fruit_config_data, return false); if (!config->wipe_intentionally_left_blank_rfork) { @@ -1475,7 +1476,7 @@ static int ad_convert(struct vfs_handle_struct *handle, goto done; } - ok = ad_convert_blank_rfork(ad, &blank); + ok = ad_convert_blank_rfork(handle, ad, &blank); if (!ok) { ret = -1; goto done; |