Attachment 5200 Details for Bug 6876 – git-am format patch for 3.5.0. Second part of the fix.

[patch] git-am format patch for 3.5.0. Second part of the fix.

0001-Modification-of-fix-for-bug-6876-Delete-of-an-object.patch (text/plain), 1.74 KB, created by Jeremy Allison on 2010-01-16 19:30:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-01-16 19:30:54 UTC

Size: 1.74 KB

patch

obsolete

>From 88016a94ea9651478161a391408d55905c466bd0 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Sat, 16 Jan 2010 17:03:06 -0800
>Subject: [PATCH] Modification of fix for bug 6876 - Delete of an object whose parent folder does not have delete rights fails even if the delete right is set on the object
>
>Suggested by Volker. Reduce the surface area of the
>become_root() unbecome_root() code to reduce the chance
>of errors.
>
>Jeremy.
>(cherry picked from commit 98a495f1e674b7562a3d8b5dfc958ee95d256896)
>---
> source3/modules/vfs_acl_common.c |   13 +++++--------
> 1 files changed, 5 insertions(+), 8 deletions(-)
>
>diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
>index aeb9ce3..30a59e2 100644
>--- a/source3/modules/vfs_acl_common.c
>+++ b/source3/modules/vfs_acl_common.c
>@@ -821,11 +821,14 @@ static int acl_common_remove_object(vfs_handle_struct *handle,
> 		goto out;
> 	}
> 
>+	become_root();
> 	if (is_directory) {
> 		ret = SMB_VFS_NEXT_RMDIR(handle, final_component);
> 	} else {
> 		ret = SMB_VFS_NEXT_UNLINK(handle, &local_fname);
> 	}
>+	unbecome_root();
>+
> 	if (ret == -1) {
> 		saved_errno = errno;
> 	}
>@@ -854,12 +857,9 @@ static int rmdir_acl_common(struct vfs_handle_struct *handle,
> 		return ret;
> 	}
> 
>-	become_root();
>-	ret = acl_common_remove_object(handle,
>+	return acl_common_remove_object(handle,
> 					path,
> 					true);
>-	unbecome_root();
>-	return ret;
> }
> 
> static NTSTATUS create_file_acl_common(struct vfs_handle_struct *handle,
>@@ -977,10 +977,7 @@ static int unlink_acl_common(struct vfs_handle_struct *handle,
> 		return ret;
> 	}
> 
>-	become_root();
>-	ret = acl_common_remove_object(handle,
>+	return acl_common_remove_object(handle,
> 					smb_fname->base_name,
> 					false);
>-	unbecome_root();
>-	return ret;
> }
>-- 
>1.6.3.3
>

Flags:

vl: review+

Actions: View

Attachments on bug 6876: 5153 | 5161 | 5200 | 5299