From: Ralph Boehme <slow@samba.org>
Date: Fri, 9 Dec 2016 17:22:49 +0000 (+0100)
Subject: vfs_fruit: fix fruit_rmdir() for the fruit:resource!=file case
X-Git-Tag: tdb-1.3.13~723
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=19854072dbb7a9ba97d48f4012ea3a238721fc58

vfs_fruit: fix fruit_rmdir() for the fruit:resource!=file case

The following code must only be executed for the fruit:resource=file
case. Otherwise no change in behaviour.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12427

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index a305adad410..c479c2c1e2f 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3114,7 +3114,7 @@ static int fruit_rmdir(struct vfs_handle_struct *handle,
 	SMB_VFS_HANDLE_GET_DATA(handle, config,
 				struct fruit_config_data, return -1);
 
-	if (!handle->conn->cwd || !path || (config->rsrc == FRUIT_RSRC_XATTR)) {
+	if (config->rsrc != FRUIT_RSRC_ADFILE) {
 		goto exit_rmdir;
 	}