summaryrefslogtreecommitdiff
path: root/source3/modules/vfs_posix_eadb.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2016-02-24 14:02:45 -0800
committerMichael Adam <obnox@samba.org>2016-02-25 20:46:49 +0100
commitcd1335e67dbfce0b6894ff209aa805d0314578da (patch)
tree835ffef3668cdd93bc1805cd1fabac03d6b055b2 /source3/modules/vfs_posix_eadb.c
parentde2bc1bc3890bcdd1b3b97ecc3d7e96f58ff50d3 (diff)
downloadsamba-cd1335e67dbfce0b6894ff209aa805d0314578da.tar.gz
VFS: Modify rmdir to take a const struct smb_filename * instead of const char *
Preparing to reduce use of lp_posix_pathnames(). Uses the same techniques as commit 616d068f0cebb8e50a855b6e30f36fccb7f5a3c8 (synthetic_smb_fname()) to cope with modules that modify the incoming pathname. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Thu Feb 25 20:46:49 CET 2016 on sn-devel-144
Diffstat (limited to 'source3/modules/vfs_posix_eadb.c')
-rw-r--r--source3/modules/vfs_posix_eadb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/modules/vfs_posix_eadb.c b/source3/modules/vfs_posix_eadb.c
index 20679e16ae0..1d165298a2e 100644
--- a/source3/modules/vfs_posix_eadb.c
+++ b/source3/modules/vfs_posix_eadb.c
@@ -343,11 +343,13 @@ out:
/*
* On rmdir we need to delete the tdb record
*/
-static int posix_eadb_rmdir(vfs_handle_struct *handle, const char *path)
+static int posix_eadb_rmdir(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname)
{
NTSTATUS status;
struct tdb_wrap *ea_tdb;
int ret;
+ const char *path = smb_fname->base_name;
SMB_VFS_HANDLE_GET_DATA(handle, ea_tdb, struct tdb_wrap, return -1);
@@ -360,7 +362,7 @@ static int posix_eadb_rmdir(vfs_handle_struct *handle, const char *path)
tdb_transaction_cancel(ea_tdb->tdb);
}
- ret = SMB_VFS_NEXT_RMDIR(handle, path);
+ ret = SMB_VFS_NEXT_RMDIR(handle, smb_fname);
if (ret == -1) {
tdb_transaction_cancel(ea_tdb->tdb);