s3: VFS: ceph: Fix cephwrap_mknodat() to cope with real directory fsps.
authorJeremy Allison <jra@samba.org>
Thu, 14 Jan 2021 20:35:29 +0000 (12:35 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 15 Jan 2021 20:56:28 +0000 (20:56 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/modules/vfs_ceph.c

index ed5cf50e7b2461c3c334e7ecc2995c589efdfaab..b2d9ead1db5ef91a5a1a2df2b030239df797f8d2 100644 (file)
@@ -1111,11 +1111,22 @@ static int cephwrap_mknodat(struct vfs_handle_struct *handle,
                mode_t mode,
                SMB_DEV_T dev)
 {
+       struct smb_filename *full_fname = NULL;
        int result = -1;
-       DBG_DEBUG("[CEPH] mknodat(%p, %s)\n", handle, smb_fname->base_name);
-       SMB_ASSERT(dirfsp == dirfsp->conn->cwd_fsp);
-       result = ceph_mknod(handle->data, smb_fname->base_name, mode, dev);
+
+       full_fname = full_path_from_dirfsp_atname(talloc_tos(),
+                                               dirfsp,
+                                               smb_fname);
+       if (full_fname == NULL) {
+               return -1;
+       }
+
+       DBG_DEBUG("[CEPH] mknodat(%p, %s)\n", handle, full_fname->base_name);
+       result = ceph_mknod(handle->data, full_fname->base_name, mode, dev);
        DBG_DEBUG("[CEPH] mknodat(...) = %d\n", result);
+
+       TALLOC_FREE(full_fname);
+
        WRAP_RETURN(result);
 }