Attachment 5299 Details for Bug 6876 – git am format patch for 3.5.0 (third part of the fix - correctls acl_tdb module).

git am format patch for 3.5.0 (third part of the fix - correctls acl_tdb module).

0001-Fix-bug-6876-for-acl_tdb-module.patch (text/x-diff), 1.08 KB, created by Jeremy Allison on 2010-02-08 17:19:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-02-08 17:19:38 UTC

Size: 1.08 KB

patch

obsolete

>From e425162933cd7a589e224da057b390d3d7e9b47a Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Mon, 8 Feb 2010 11:04:38 -0800
>Subject: [PATCH] Fix bug #6876 for acl_tdb module.
>
>As pointed out by bj@sernet.de, the rmdir module initializer was
>duplicated. Fix this properly.
>
>Jeremy.
>---
> source3/modules/vfs_acl_tdb.c |    3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
>diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
>index 2afe69d..ac11a51 100644
>--- a/source3/modules/vfs_acl_tdb.c
>+++ b/source3/modules/vfs_acl_tdb.c
>@@ -299,7 +299,7 @@ static int rmdir_acl_tdb(vfs_handle_struct *handle, const char *path)
> 		return -1;
> 	}
> 
>-	ret = SMB_VFS_NEXT_RMDIR(handle, path);
>+	ret = rmdir_acl_common(handle, path);
> 	if (ret == -1) {
> 		return -1;
> 	}
>@@ -413,7 +413,6 @@ static struct vfs_fn_pointers vfs_acl_tdb_fns = {
> 	.connect_fn = connect_acl_tdb,
> 	.opendir = opendir_acl_common,
> 	.mkdir = mkdir_acl_common,
>-	.rmdir = rmdir_acl_common,
> 	.open = open_acl_common,
> 	.create_file = create_file_acl_common,
> 	.unlink = unlink_acl_tdb,
>-- 
>1.6.6
>

Flags:

bjacke: review+

Actions: View

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