sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-22 02:50:28 +03:00
Code

vfs_fruit: on-access conversion of AppleDouble xattr data

Browse Source 
This finally adds on-access conversion of xattr data stored in sidecar
AppleDouble files.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13076

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(backported from commit d7068324407a9a0b94d992b539631246e97c9098)
This commit is contained in:
Ralph Boehme 2017-10-11 12:58:59 +02:00 committed by Karolin Seeger
parent 5fb403f3b2
commit cbddb21c05
2 changed files with 121 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
source3/modules/vfs_fruit.c
View File

@ -31,6 +31,7 @@
#include "../libcli/smb/smb2_create_ctx.h"
#include "lib/util/sys_rw.h"
#include "lib/util/tevent_ntstatus.h"
#include "string_replace.h"
/*
* Enhanced OS X and Netatalk compatibility
@ -927,6 +928,119 @@ static bool ad_unpack(struct adouble *ad, const size_t nentries,
return true;
}
static bool ad_convert_xattr(struct adouble *ad,
const char *path,
char *map)
{
static struct char_mappings **string_replace_cmaps = NULL;
uint16_t i;
int saved_errno = 0;
NTSTATUS status;
if (ad->adx_header.adx_num_attrs == 0) {
return true;
}
if (string_replace_cmaps == NULL) {
const char **mappings = NULL;
mappings = str_list_make_v3_const(
talloc_tos(), fruit_catia_maps, NULL);
if (mappings == NULL) {
return false;
}
string_replace_cmaps = string_replace_init_map(mappings);
TALLOC_FREE(mappings);
}
for (i = 0; i < ad->adx_header.adx_num_attrs; i++) {
struct ad_xattr_entry *e = &ad->adx_entries[i];
char *mapped_name = NULL;
char *tmp = NULL;
struct smb_filename *stream_name = NULL;
files_struct *fsp = NULL;
ssize_t nwritten;
status = string_replace_allocate(ad->ad_handle->conn,
e->adx_name,
string_replace_cmaps,
talloc_tos(),
&mapped_name,
vfs_translate_to_windows);
if (!NT_STATUS_IS_OK(status) &&
!NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED))
{
DBG_ERR("string_replace_allocate failed\n");
return -1;
}
tmp = mapped_name;
mapped_name = talloc_asprintf(talloc_tos(), ":%s", tmp);
TALLOC_FREE(tmp);
if (mapped_name == NULL) {
return -1;
}
stream_name = synthetic_smb_fname(talloc_tos(),
path,
mapped_name,
NULL,
0);
TALLOC_FREE(mapped_name);
if (stream_name == NULL) {
DBG_ERR("synthetic_smb_fname failed\n");
return -1;
}
DBG_DEBUG("stream_name: %s\n", smb_fname_str_dbg(stream_name));
status = SMB_VFS_CREATE_FILE(
ad->ad_handle->conn, /* conn */
NULL, /* req */
0, /* root_dir_fid */
stream_name, /* fname */
FILE_GENERIC_WRITE, /* access_mask */
FILE_SHARE_READ | FILE_SHARE_WRITE, /* share_access */
FILE_OPEN_IF, /* create_disposition */
0, /* create_options */
0, /* file_attributes */
INTERNAL_OPEN_ONLY, /* oplock_request */
NULL, /* lease */
0, /* allocation_size */
0, /* private_flags */
NULL, /* sd */
NULL, /* ea_list */
&fsp, /* result */
NULL, /* psbuf */
NULL, NULL); /* create context */
TALLOC_FREE(stream_name);
if (!NT_STATUS_IS_OK(status)) {
DBG_ERR("SMB_VFS_CREATE_FILE failed\n");
return -1;
}
nwritten = SMB_VFS_PWRITE(fsp,
map + e->adx_offset,
e->adx_length,
0);
if (nwritten == -1) {
DBG_ERR("SMB_VFS_PWRITE failed\n");
saved_errno = errno;
close_file(NULL, fsp, ERROR_CLOSE);
errno = saved_errno;
return -1;
}
status = close_file(NULL, fsp, NORMAL_CLOSE);
if (!NT_STATUS_IS_OK(status)) {
return -1;
}
fsp = NULL;
}
return true;
}
/**
* Convert from Apple's ._ file to Netatalk
*
@ -944,6 +1058,7 @@ static int ad_convert(struct adouble *ad,
int rc = 0;
char *map = MAP_FAILED;
size_t origlen;
bool ok;
origlen = ad_getentryoff(ad, ADEID_RFORK) +
ad_getentrylen(ad, ADEID_RFORK);
@ -956,6 +1071,11 @@ static int ad_convert(struct adouble *ad,
goto exit;
}
ok = ad_convert_xattr(ad, path, map);
if (!ok) {
return -1;
}
if (ad_getentrylen(ad, ADEID_RFORK) > 0) {
memmove(map + ad_getentryoff(ad, ADEID_FINDERI) + ADEDLEN_FINDERI,
map + ad_getentryoff(ad, ADEID_RFORK),

2
source3/modules/wscript_build
View File

@ -92,7 +92,7 @@ bld.SAMBA3_MODULE('vfs_netatalk',
bld.SAMBA3_MODULE('vfs_fruit',
subsystem='vfs',
source='vfs_fruit.c',
deps='samba-util',
deps='samba-util STRING_REPLACE',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fruit'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fruit'))