VFS: Modify rmdir to take a const struct smb_filename * instead of const char *

[kai/samba-autobuild/.git] / source3 / torture / cmd_vfs.c

diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index f9819da1c6b900755bc5e8c31c9023b9896af99f..6dcf80544d5fd0f740c5d9ea2145c8304d4a77f8 100644 (file)
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -399,6 +399,7 @@ static NTSTATUS cmd_open(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
 
 static NTSTATUS cmd_pathfunc(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
 {
+       struct smb_filename *smb_fname = NULL;
        int ret = -1;
 
        if (argc != 2) {
@@ -406,16 +407,19 @@ static NTSTATUS cmd_pathfunc(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int arg
                return NT_STATUS_OK;
        }
 
-       if (strcmp("rmdir", argv[0]) == 0 ) {
-               ret = SMB_VFS_RMDIR(vfs->conn, argv[1]);
-       } else if (strcmp("unlink", argv[0]) == 0 ) {
-               struct smb_filename *smb_fname;
+       smb_fname = synthetic_smb_fname(talloc_tos(),
+                                       argv[1],
+                                       NULL,
+                                       NULL);
 
-               smb_fname = synthetic_smb_fname_split(mem_ctx, argv[1], NULL);
-               if (smb_fname == NULL) {
-                       return NT_STATUS_NO_MEMORY;
-               }
+       if (smb_fname == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
+       if (strcmp("rmdir", argv[0]) == 0 ) {
+               ret = SMB_VFS_RMDIR(vfs->conn, smb_fname);
+               TALLOC_FREE(smb_fname);
+       } else if (strcmp("unlink", argv[0]) == 0 ) {
                ret = SMB_VFS_UNLINK(vfs->conn, smb_fname);
                TALLOC_FREE(smb_fname);
        } else if (strcmp("chdir", argv[0]) == 0 ) {