s3: VFS: ceph_snapshots: In ceph_snap_gmt_convert_dir(), re-use the directory handle...

Similar change to the one that went into shadow_copy2.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/modules/vfs_ceph_snapshots.c b/source3/modules/vfs_ceph_snapshots.c
index 5249aac8db9b24995214595d83a2e4d2a63312a1..35681e24e0b06376f2f33ec69f76cd4e009578c9 100644 (file)
--- a/source3/modules/vfs_ceph_snapshots.c
+++ b/source3/modules/vfs_ceph_snapshots.c
@@ -472,6 +472,7 @@ static int ceph_snap_gmt_convert_dir(struct vfs_handle_struct *handle,
        int ret;
        NTSTATUS status;
        struct smb_Dir *dir_hnd = NULL;
+       struct files_struct *dirfsp = NULL;
        const char *dname = NULL;
        char *talloced = NULL;
        long offset = 0;
@@ -517,19 +518,6 @@ static int ceph_snap_gmt_convert_dir(struct vfs_handle_struct *handle,
                goto err_out;
        }
 
-       status = smbd_check_access_rights(handle->conn,
-                                       handle->conn->cwd_fsp,
-                                       snaps_dname,
-                                       false,
-                                       SEC_DIR_LIST);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("user does not have list permission "
-                       "on snapdir %s\n",
-                       snaps_dname->base_name));
-               ret = -map_errno_from_nt_status(status);
-               goto err_out;
-       }
-
        DBG_DEBUG("enumerating shadow copy dir at %s\n",
                  snaps_dname->base_name);
 
@@ -539,6 +527,19 @@ static int ceph_snap_gmt_convert_dir(struct vfs_handle_struct *handle,
                goto err_out;
        }
 
+       /* Check we have SEC_DIR_LIST access on this fsp. */
+       dirfsp = dir_hnd_fetch_fsp(dir_hnd);
+       status = smbd_check_access_rights_fsp(dirfsp,
+                                             false,
+                                             SEC_DIR_LIST);
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_ERR("user does not have list permission "
+                       "on snapdir %s\n",
+                       fsp_str_dbg(dirfsp));
+               ret = -map_errno_from_nt_status(status);
+               goto err_out;
+       }
+
         while ((dname = ReadDirName(dir_hnd, &offset, NULL, &talloced))
               != NULL)
        {