[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  83edfcff5cc vfs_ceph: call 'ceph_fgetxattr' only if valid fd
      from  af53df6cd6e python/samba/tests: Fix incorrect super-class in cred_opt.py setUp()

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 83edfcff5ccd8c4c710576b6d5612e0578d168c8
Author: Shachar Sharon <ssharon at redhat.com>
Date:   Thu Nov 16 11:57:02 2023 +0200

    vfs_ceph: call 'ceph_fgetxattr' only if valid fd
    
    Align getxattr logic with the rest of xattr hooks: call ceph_fgetxattr
    with appropriate io-fd when 'is_pathref' is false; otherwise, call
    ceph_getxattr.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15440
    
    Signed-off-by: Shachar Sharon <ssharon at redhat.com>
    Reviewed-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Thu Nov 30 12:32:29 UTC 2023 on atb-devel-224

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_ceph.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 6d252d20425..b1039ee36ef 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -1431,11 +1431,32 @@ static const char *cephwrap_connectpath(
  Extended attribute operations.
 *****************************************************************/
 
-static ssize_t cephwrap_fgetxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, void *value, size_t size)
+static ssize_t cephwrap_fgetxattr(struct vfs_handle_struct *handle,
+				  struct files_struct *fsp,
+				  const char *name,
+				  void *value,
+				  size_t size)
 {
 	int ret;
-	DBG_DEBUG("[CEPH] fgetxattr(%p, %p, %s, %p, %llu)\n", handle, fsp, name, value, llu(size));
-	ret = ceph_fgetxattr(handle->data, fsp_get_io_fd(fsp), name, value, size);
+	DBG_DEBUG("[CEPH] fgetxattr(%p, %p, %s, %p, %llu)\n",
+		  handle,
+		  fsp,
+		  name,
+		  value,
+		  llu(size));
+	if (!fsp->fsp_flags.is_pathref) {
+		ret = ceph_fgetxattr(handle->data,
+				     fsp_get_io_fd(fsp),
+				     name,
+				     value,
+				     size);
+	} else {
+		ret = ceph_getxattr(handle->data,
+				    fsp->fsp_name->base_name,
+				    name,
+				    value,
+				    size);
+	}
 	DBG_DEBUG("[CEPH] fgetxattr(...) = %d\n", ret);
 	if (ret < 0) {
 		WRAP_RETURN(ret);


-- 
Samba Shared Repository