Attachment 6779 Details for Bug 8370 – Back-port for 3.5.12.

[patch] Back-port for 3.5.12.

look1 (text/plain), 1.11 KB, created by Jeremy Allison on 2011-08-11 22:07:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-08-11 22:07:08 UTC

Size: 1.11 KB

patch

obsolete

>diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
>index ee33f21..b209824 100644
>--- a/source3/modules/vfs_acl_common.c
>+++ b/source3/modules/vfs_acl_common.c
>@@ -825,6 +825,13 @@ static int acl_common_remove_object(vfs_handle_struct *handle,
> 	const char *final_component = NULL;
> 	struct smb_filename local_fname;
> 	int saved_errno = 0;
>+	char *saved_dir = NULL;
>+
>+	saved_dir = vfs_GetWd(talloc_tos(),conn);
>+	if (!saved_dir) {
>+		saved_errno = errno;
>+		goto out;
>+	}
> 
> 	if (!parent_dirname(talloc_tos(), path,
> 			&parent_dir, &final_component)) {
>@@ -837,7 +844,7 @@ static int acl_common_remove_object(vfs_handle_struct *handle,
> 		parent_dir, final_component ));
> 
> 	/* cd into the parent dir to pin it. */
>-	ret = SMB_VFS_CHDIR(conn, parent_dir);
>+	ret = vfs_ChDir(conn, parent_dir);
> 	if (ret == -1) {
> 		saved_errno = errno;
> 		goto out;
>@@ -890,7 +897,9 @@ static int acl_common_remove_object(vfs_handle_struct *handle,
> 
> 	TALLOC_FREE(parent_dir);
> 
>-	vfs_ChDir(conn, conn->connectpath);
>+	if (saved_dir) {
>+		vfs_ChDir(conn, saved_dir);
>+	}
> 	if (saved_errno) {
> 		errno = saved_errno;
> 	}

Flags:

vl: review+

Actions: View

Attachments on bug 8370: 6772 | 6776 | 6777 | 6778 | 6779