Fix bug #6876 for acl_tdb module.
authorJeremy Allison <jra@samba.org>
Mon, 8 Feb 2010 19:04:38 +0000 (11:04 -0800)
committerJeremy Allison <jra@samba.org>
Mon, 8 Feb 2010 19:04:38 +0000 (11:04 -0800)
As pointed out by bj@sernet.de, the rmdir module initializer was
duplicated. Fix this properly.

Jeremy.

source3/modules/vfs_acl_tdb.c

index 2afe69d..ac11a51 100644 (file)
@@ -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,