From: Jeremy Allison <jra@samba.org>
Date: Mon, 8 Feb 2010 19:04:38 +0000 (-0800)
Subject: Fix bug #6876 for acl_tdb module.
X-Git-Tag: samba-3.6.0pre1~5511
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e425162933cd7a589e224da057b390d3d7e9b47a;p=thirdparty%2Fsamba.git

Fix bug #6876 for acl_tdb module.

As pointed out by bj@sernet.de, the rmdir module initializer was
duplicated. Fix this properly.

Jeremy.
---

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 2afe69d7645..ac11a51b3bb 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,