From 19a4c5a99334ac38becdf6197e154f98c0455ff6 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 4 Oct 2019 14:39:30 -0700 Subject: [PATCH] s3: VFS: vfs_acl_tdb: Remove rmdir_fn(). No longer used. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/modules/vfs_acl_tdb.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index 267e7883e3f..41a65891084 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -282,34 +282,6 @@ static int unlinkat_acl_tdb(vfs_handle_struct *handle, return ret; } -/********************************************************************* - On rmdir we need to delete the tdb record (if using tdb). -*********************************************************************/ - -static int rmdir_acl_tdb(vfs_handle_struct *handle, - const struct smb_filename *smb_fname) -{ - - SMB_STRUCT_STAT sbuf; - struct db_context *db = acl_db; - int ret = -1; - - ret = vfs_stat_smb_basename(handle->conn, smb_fname, &sbuf); - if (ret == -1) { - return -1; - } - - ret = rmdir_acl_common(handle, - handle->conn->cwd_fsp, - smb_fname); - if (ret == -1) { - return -1; - } - - acl_tdb_delete(handle, db, &sbuf); - return 0; -} - /******************************************************************* Handle opening the storage tdb if so configured. *******************************************************************/ @@ -501,7 +473,6 @@ static NTSTATUS acl_tdb_fset_nt_acl(vfs_handle_struct *handle, static struct vfs_fn_pointers vfs_acl_tdb_fns = { .connect_fn = connect_acl_tdb, .disconnect_fn = disconnect_acl_tdb, - .rmdir_fn = rmdir_acl_tdb, .unlinkat_fn = unlinkat_acl_tdb, .chmod_fn = chmod_acl_module_common, .fchmod_fn = fchmod_acl_module_common, -- 2.47.3