From ee431fc5254dc735662d152dd19a81d439ca5e44 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Sat, 19 Dec 2015 18:27:06 +0100 Subject: [PATCH] vfs_fruit: ignore delete on the AFP_Resource stream 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 Reviewed-by: Jeremy Allison --- source3/modules/vfs_fruit.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 34b35247b0b..cb0d2848fa3 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -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); -- 2.34.1