summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-02-08 11:04:38 -0800
committerJeremy Allison <jra@samba.org>2010-02-08 11:04:38 -0800
commite425162933cd7a589e224da057b390d3d7e9b47a (patch)
tree37a5bc8ea3b68e031bb00b2249957e9046e526c4
parent9b5198dd443a00fdad4faa1f9cdabedd81012d93 (diff)
downloadsamba-e425162933cd7a589e224da057b390d3d7e9b47a.tar.gz
samba-e425162933cd7a589e224da057b390d3d7e9b47a.tar.bz2
samba-e425162933cd7a589e224da057b390d3d7e9b47a.zip
Fix bug #6876 for acl_tdb module.
As pointed out by bj@sernet.de, the rmdir module initializer was duplicated. Fix this properly. Jeremy.
-rw-r--r--source3/modules/vfs_acl_tdb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 2afe69d764..ac11a51b3b 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,