[SCM] Samba Shared Repository - branch v4-21-test updated

[Jule Anger]

The branch, v4-21-test has been updated
       via  b7843d0f422 vfs_shadow_copy2: Use VFS interface to derive mount point
      from  cb882609555 ctdb-utils: Fix incorrect FSF address

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-21-test


- Log -----------------------------------------------------------------
commit b7843d0f422386f17868a392d6ca37df5f4de3dd
Author: Anoop C S <anoopcs at samba.org>
Date:   Thu Feb 6 17:50:10 2025 +0530

    vfs_shadow_copy2: Use VFS interface to derive mount point
    
    shadow_copy2_find_mount_point() does direct stat() calls locally while
    trying to automatically detect the mount point. This cannot be always
    true as there are virtual file systems like CephFS, GlusterFS etc.
    without their share path locally available on the system. Instead use
    the VFS interface to make the stat calls hit the underlying file system
    irrespective of their local presence in the system.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15797
    
    Signed-off-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: John Mulligan <jmulligan at samba.org>
    
    Autobuild-User(master): Anoop C S <anoopcs at samba.org>
    Autobuild-Date(master): Fri Feb  7 06:23:12 UTC 2025 on atb-devel-224
    
    (cherry picked from commit c7d0adade09fa264201a125b28dd76c163451260)
    
    Autobuild-User(v4-21-test): Jule Anger <janger at samba.org>
    Autobuild-Date(v4-21-test): Fri Mar  7 10:29:28 UTC 2025 on atb-devel-224

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

Summary of changes:
 source3/modules/vfs_shadow_copy2.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index c14c7b6be6b..ffe2936abff 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -726,31 +726,42 @@ static bool _shadow_copy2_strip_snapshot_converted(TALLOC_CTX *mem_ctx,
 static char *shadow_copy2_find_mount_point(TALLOC_CTX *mem_ctx,
 					   vfs_handle_struct *handle)
 {
-	char *path = talloc_strdup(mem_ctx, handle->conn->connectpath);
+	struct smb_filename *smb_fname_cpath = NULL;
 	dev_t dev;
-	struct stat st;
 	char *p;
 
-	if (stat(path, &st) != 0) {
-		talloc_free(path);
+	smb_fname_cpath = synthetic_smb_fname(mem_ctx,
+					      handle->conn->connectpath,
+					      NULL,
+					      NULL,
+					      0,
+					      0);
+	if (smb_fname_cpath == NULL) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	if (SMB_VFS_NEXT_STAT(handle, smb_fname_cpath) != 0) {
+		TALLOC_FREE(smb_fname_cpath);
 		return NULL;
 	}
 
-	dev = st.st_dev;
+	dev = smb_fname_cpath->st.st_ex_dev;
 
-	while ((p = strrchr(path, '/')) && p > path) {
+	while ((p = strrchr(smb_fname_cpath->base_name, '/')) &&
+			p > smb_fname_cpath->base_name) {
 		*p = 0;
-		if (stat(path, &st) != 0) {
-			talloc_free(path);
+		if (SMB_VFS_NEXT_STAT(handle, smb_fname_cpath) != 0) {
+			TALLOC_FREE(smb_fname_cpath);
 			return NULL;
 		}
-		if (st.st_dev != dev) {
+		if (smb_fname_cpath->st.st_ex_dev != dev) {
 			*p = '/';
 			break;
 		}
 	}
 
-	return path;
+	return smb_fname_cpath->base_name;
 }
 
 /**


-- 
Samba Shared Repository