]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vfs_default: support pathref fd's in vfswrap_fgetxattr()
authorRalph Boehme <slow@samba.org>
Tue, 29 Sep 2020 08:55:52 +0000 (10:55 +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 9b63158872cef53f2999c6f9a3090967e0dd52f0..b0ed0395e5fd3af181498fbc1bd230fe9c8c51ea 100644 (file)
@@ -3556,7 +3556,28 @@ static ssize_t vfswrap_fgetxattr(struct vfs_handle_struct *handle,
                                 void *value,
                                 size_t size)
 {
-       return fgetxattr(fsp_get_io_fd(fsp), name, value, size);
+       int fd = fsp_get_pathref_fd(fsp);
+
+       if (!fsp->fsp_flags.is_pathref) {
+               return fgetxattr(fd, name, value, 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 getxattr(p, name, value, size);
+       }
+
+       /*
+        * This is no longer a handle based call.
+        */
+       return getxattr(fsp->fsp_name->base_name, name, value, size);
 }
 
 static ssize_t vfswrap_listxattr(struct vfs_handle_struct *handle,