sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-15 05:57:49 +03:00
Code

vfs_fruit: call ad_convert_move_reso() from ad_convert_xattr()

Browse Source 
ad_convert_xattr() is the place that triggers the need to move the
resource fork, so it should also call ad_convert_move_reso().

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 70d3ae5a89fc62db192c44b92a5b7fb67a93d88e)
This commit is contained in:
Ralph Boehme 2018-10-05 22:05:43 +02:00 committed by Karolin Seeger
parent a1c29dbf87
commit 0d1f964b60
1 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
source3/modules/vfs_fruit.c
View File

@ -942,6 +942,58 @@ static bool ad_unpack(struct adouble *ad, const size_t nentries,
return true;
}
static bool ad_convert_move_reso(struct adouble *ad,
const struct smb_filename *smb_fname)
{
char *map = MAP_FAILED;
size_t maplen;
ssize_t len;
int rc;
bool ok;
if (ad_getentrylen(ad, ADEID_RFORK) == 0) {
return true;
}
maplen = ad_getentryoff(ad, ADEID_RFORK) +
ad_getentrylen(ad, ADEID_RFORK);
/* FIXME: direct use of mmap(), vfs_aio_fork does it too */
map = mmap(NULL, maplen, PROT_READ|PROT_WRITE, MAP_SHARED,
ad->ad_fd, 0);
if (map == MAP_FAILED) {
DBG_ERR("mmap AppleDouble: %s\n", strerror(errno));
return false;
}
memmove(map + ADEDOFF_RFORK_DOT_UND,
map + ad_getentryoff(ad, ADEID_RFORK),
ad_getentrylen(ad, ADEID_RFORK));
rc = munmap(map, maplen);
if (rc != 0) {
DBG_ERR("munmap failed: %s\n", strerror(errno));
return false;
}
ad_setentryoff(ad, ADEID_RFORK, ADEDOFF_RFORK_DOT_UND);
ok = ad_pack(ad);
if (!ok) {
DBG_WARNING("ad_pack [%s] failed\n", smb_fname->base_name);
return false;
}
len = sys_pwrite(ad->ad_fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
if (len != AD_DATASZ_DOT_UND) {
DBG_ERR("%s: bad size: %zd\n", smb_fname->base_name, len);
return false;
}
return true;
}
static bool ad_convert_xattr(struct adouble *ad,
const struct smb_filename *smb_fname)
{
@ -1088,6 +1140,11 @@ static bool ad_convert_xattr(struct adouble *ad,
goto fail;
}
ok = ad_convert_move_reso(ad, smb_fname);
if (!ok) {
goto fail;
}
ok = true;
fail:
@ -1214,57 +1271,6 @@ static bool ad_convert_truncate(struct adouble *ad,
return true;
}
static bool ad_convert_move_reso(struct adouble *ad,
const struct smb_filename *smb_fname)
{
char *map = MAP_FAILED;
size_t maplen;
ssize_t len;
int rc;
bool ok;
if (ad_getentrylen(ad, ADEID_RFORK) == 0) {
return true;
}
maplen = ad_getentryoff(ad, ADEID_RFORK) +
ad_getentrylen(ad, ADEID_RFORK);
/* FIXME: direct use of mmap(), vfs_aio_fork does it too */
map = mmap(NULL, maplen, PROT_READ|PROT_WRITE, MAP_SHARED,
ad->ad_fd, 0);
if (map == MAP_FAILED) {
DBG_ERR("mmap AppleDouble: %s\n", strerror(errno));
return false;
}
memmove(map + ADEDOFF_RFORK_DOT_UND,
map + ad_getentryoff(ad, ADEID_RFORK),
ad_getentrylen(ad, ADEID_RFORK));
rc = munmap(map, maplen);
if (rc != 0) {
DBG_ERR("munmap failed: %s\n", strerror(errno));
return false;
}
ad_setentryoff(ad, ADEID_RFORK, ADEDOFF_RFORK_DOT_UND);
ok = ad_pack(ad);
if (!ok) {
DBG_WARNING("ad_pack [%s] failed\n", smb_fname->base_name);
return false;
}
len = sys_pwrite(ad->ad_fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
if (len != AD_DATASZ_DOT_UND) {
DBG_ERR("%s: bad size: %zd\n", smb_fname->base_name, len);
return false;
}
return true;
}
/**
* Convert from Apple's ._ file to Netatalk
*
@ -1288,11 +1294,6 @@ static int ad_convert(struct adouble *ad,
return -1;
}
ok = ad_convert_move_reso(ad, smb_fname);
if (!ok) {
return -1;
}
ok = ad_convert_truncate(ad, smb_fname);
if (!ok) {
return -1;