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

vfs_fruit: ignore delete on the AFP_Resource stream

Browse Source 
OS X ignores deletes on the AFP_Resource stream. This was discovered by
torture tests against OS X SMB server.

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2015-12-19 18:27:06 +01:00 committed by Jeremy Allison
parent decde0b481
commit ee431fc525
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source3/modules/vfs_fruit.c
View File

@ -2478,27 +2478,8 @@ static int fruit_unlink(vfs_handle_struct *handle,
}
if (is_afpresource_stream(smb_fname)) {
if (config->rsrc == FRUIT_RSRC_ADFILE) {
char *adp = NULL;
rc = adouble_path(talloc_tos(),
smb_fname->base_name, &adp);
if (rc != 0) {
return -1;
}
/* FIXME: direct unlink(), missing smb_fname */
rc = unlink(adp);
if ((rc == -1) && (errno == ENOENT)) {
rc = 0;
}
TALLOC_FREE(adp);
} else {
rc = SMB_VFS_REMOVEXATTR(handle->conn,
smb_fname->base_name,
AFPRESOURCE_EA_NETATALK);
}
return rc;
/* OS X ignores deletes on the AFP_Resource stream */
return 0;
}
return SMB_VFS_NEXT_UNLINK(handle, smb_fname);