From: Jeremy Allison <jra@samba.org>
Date: Wed, 23 Jun 2021 17:48:49 +0000 (-0700)
Subject: s3: VFS: fake_acls: In fake_acls_stat() - Now we always have a valid fsp, remove... 
X-Git-Tag: tevent-0.11.0~184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e5180783882ed842fcee172ed67f4eae5099697;p=thirdparty%2Fsamba.git

s3: VFS: fake_acls: In fake_acls_stat() - Now we always have a valid fsp, remove the calls to the path-based functions.

Comment out fake_acls_uid()/fake_acls_gid(), they are no longer used.

Signed-off-by: Jeremy Allison <jra@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 5dd3cddccb7..ffbb5f7dc1d 100644
--- a/source3/modules/vfs_fake_acls.c
+++ b/source3/modules/vfs_fake_acls.c
@@ -35,6 +35,7 @@
 #define FAKE_ACL_ACCESS_XATTR "system.fake_access_acl"
 #define FAKE_ACL_DEFAULT_XATTR "system.fake_default_acl"
 
+#if 0
 static int fake_acls_uid(vfs_handle_struct *handle,
 			 struct smb_filename *smb_fname,
 			 uid_t *uid)
@@ -71,6 +72,7 @@ static int fake_acls_gid(vfs_handle_struct *handle,
 	*gid = IVAL(gid_buf, 0);
 	return 0;
 }
+#endif
 
 static int fake_acls_fuid(vfs_handle_struct *handle,
 			   files_struct *fsp,
@@ -185,26 +187,16 @@ static int fake_acls_stat(vfs_handle_struct *handle,
 			fsp = smb_fname_cp->fsp;
 		}
 
-		if (fsp != NULL) {
-			ret = fake_acls_fuid(handle,
-					     fsp,
-					     &smb_fname->st.st_ex_uid);
-		} else {
-			ret = fake_acls_uid(handle, smb_fname_cp,
-					&smb_fname->st.st_ex_uid);
-		}
+		ret = fake_acls_fuid(handle,
+				     fsp,
+				     &smb_fname->st.st_ex_uid);
 		if (ret != 0) {
 			TALLOC_FREE(smb_fname_cp);
 			return ret;
 		}
-		if (fsp != NULL) {
-			ret = fake_acls_fgid(handle,
-					     fsp,
-					     &smb_fname->st.st_ex_gid);
-		} else {
-			ret = fake_acls_gid(handle, smb_fname_cp,
-					&smb_fname->st.st_ex_gid);
-		}
+		ret = fake_acls_fgid(handle,
+				     fsp,
+				     &smb_fname->st.st_ex_gid);
 		if (ret != 0) {
 			TALLOC_FREE(smb_fname_cp);
 			return ret;