vfs_fruit: fix fruit_rmdir() for the fruit:resource!=file case
authorRalph Boehme <slow@samba.org>
Fri, 9 Dec 2016 17:22:49 +0000 (18:22 +0100)
committerUri Simchoni <uri@samba.org>
Wed, 1 Mar 2017 23:32:21 +0000 (00:32 +0100)
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>
source3/modules/vfs_fruit.c

index a305adad4105eda3cf0643dfb60f01a28d76fd91..c479c2c1e2f9a4102e2c97fd31cc646cdce95985 100644 (file)
@@ -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;
        }