The branch, v3-5-test has been updated
       via  b5a81d9... Fix bug #6876 for acl_tdb module.
      from  8a3e7bf... s3:libsmb: fix NetServerEnum3 rap calls.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit b5a81d917e52a595f691d42372d727422286a377
Author: Jeremy Allison <[email protected]>
Date:   Mon Feb 8 11:04:38 2010 -0800

    Fix bug #6876 for acl_tdb module.
    
    As pointed out by [email protected], the rmdir module initializer was
    duplicated. Fix this properly.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_acl_tdb.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

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,


-- 
Samba Shared Repository

Reply via email to