From: Volker Lendecke <vl@samba.org>
Date: Sat, 4 Oct 2025 16:28:46 +0000 (+0200)
Subject: vfs_fake_acls: Introduce fake_acls_fuidgid()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f5580aa012a740a1c52646b2072d31b770d9d50;p=thirdparty%2Fsamba.git

vfs_fake_acls: Introduce fake_acls_fuidgid()

The callers want both

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_fake_acls.c b/source3/modules/vfs_fake_acls.c
index 35aa0f40125..d68972a3040 100644
--- a/source3/modules/vfs_fake_acls.c
+++ b/source3/modules/vfs_fake_acls.c
@@ -75,6 +75,22 @@ static int fake_acls_fgid(vfs_handle_struct *handle,
 	return 0;
 }
 
+static int fake_acls_fuidgid(vfs_handle_struct *handle,
+			     files_struct *fsp,
+			     uid_t *uid,
+			     gid_t *gid)
+{
+	int ret;
+
+	ret = fake_acls_fuid(handle, fsp, uid);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = fake_acls_fgid(handle, fsp, gid);
+	return ret;
+}
+
 static int fake_acls_stat(vfs_handle_struct *handle,
 			   struct smb_filename *smb_fname)
 {
@@ -166,20 +182,10 @@ static int fake_acls_stat(vfs_handle_struct *handle,
 		fsp = smb_fname_cp->fsp;
 	}
 
-	ret = fake_acls_fuid(handle,
-			     fsp,
-			     &smb_fname->st.st_ex_uid);
-	if (ret != 0) {
-		TALLOC_FREE(smb_fname_cp);
-		return ret;
-	}
-	ret = fake_acls_fgid(handle,
-			     fsp,
-			     &smb_fname->st.st_ex_gid);
-	if (ret != 0) {
-		TALLOC_FREE(smb_fname_cp);
-		return ret;
-	}
+	ret = fake_acls_fuidgid(handle,
+				fsp,
+				&smb_fname->st.st_ex_uid,
+				&smb_fname->st.st_ex_gid);
 	TALLOC_FREE(smb_fname_cp);
 	return ret;
 }
@@ -237,12 +243,10 @@ static int fake_acls_lstat(vfs_handle_struct *handle,
 			 * could fake them in xattr_tdb if we really wanted
 			 * to. We ignore errors because the link might not
 			 * point anywhere */
-			fake_acls_fuid(handle,
-				       smb_fname_base->fsp,
-				       &smb_fname->st.st_ex_uid);
-			fake_acls_fgid(handle,
-				       smb_fname_base->fsp,
-				       &smb_fname->st.st_ex_gid);
+			fake_acls_fuidgid(handle,
+					  smb_fname_base->fsp,
+					  &smb_fname->st.st_ex_uid,
+					  &smb_fname->st.st_ex_gid);
 		}
 		TALLOC_FREE(smb_fname_base);
 	}
@@ -255,16 +259,13 @@ static int fake_acls_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_STR
 	int ret = -1;
 
 	ret = SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
-	if (ret == 0) {
-		ret = fake_acls_fuid(handle, fsp, &sbuf->st_ex_uid);
-		if (ret != 0) {
-			return ret;
-		}
-		ret = fake_acls_fgid(handle, fsp, &sbuf->st_ex_gid);
-		if (ret != 0) {
-			return ret;
-		}
+	if (ret != 0) {
+		return ret;
 	}
+	ret = fake_acls_fuidgid(handle,
+				fsp,
+				&sbuf->st_ex_uid,
+				&sbuf->st_ex_gid);
 	return ret;
 }