]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vfs_default: support pathref fd's in vfswrap_flistxattr()
authorRalph Boehme <slow@samba.org>
Tue, 29 Sep 2020 08:56:19 +0000 (10:56 +0200)
committerRalph Boehme <slow@samba.org>
Wed, 16 Dec 2020 09:08:30 +0000 (09:08 +0000)
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/modules/vfs_default.c

index b0ed0395e5fd3af181498fbc1bd230fe9c8c51ea..1ec6f20fd95474adb3bf87d02161cb5dad8465b2 100644 (file)
@@ -3590,7 +3590,28 @@ static ssize_t vfswrap_listxattr(struct vfs_handle_struct *handle,
 
 static ssize_t vfswrap_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size)
 {
-       return flistxattr(fsp_get_io_fd(fsp), list, size);
+       int fd = fsp_get_pathref_fd(fsp);
+
+       if (!fsp->fsp_flags.is_pathref) {
+               return flistxattr(fd, list, size);
+       }
+
+       if (fsp->fsp_flags.have_proc_fds) {
+               const char *p = NULL;
+               char buf[PATH_MAX];
+
+               p = sys_proc_fd_path(fd, buf, sizeof(buf));
+               if (p == NULL) {
+                       return -1;
+               }
+
+               return listxattr(p, list, size);
+       }
+
+       /*
+        * This is no longer a handle based call.
+        */
+       return listxattr(fsp->fsp_name->base_name, list, size);
 }
 
 static int vfswrap_removexattr(struct vfs_handle_struct *handle,