From: Christof Schmitt <cs@samba.org>
Date: Thu, 18 Jul 2019 18:49:29 +0000 (-0700)
Subject: nfs4_acls: Rename smbacl4_fill_ace4 function
X-Git-Tag: samba-4.9.12~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4b61724550c2022ebb0e212aff4c844a2862f22;p=thirdparty%2Fsamba.git

nfs4_acls: Rename smbacl4_fill_ace4 function

As this function now maps the ACE and also adds it to the NFSv4 ACE,
change the name to better describe its behavior.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14032

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 169812943de23cf2752289c63331d786b0b063bd)
---

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 70d725eb937..663fcba67aa 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -708,14 +708,12 @@ static int nfs4_acl_add_ace(enum smbacl4_acedup_enum acedup,
 	return 0;
 }
 
-static int smbacl4_fill_ace4(
-	bool is_directory,
-	const struct smbacl4_vfs_params *params,
-	uid_t ownerUID,
-	gid_t ownerGID,
-	const struct security_ace *ace_nt, /* input */
-	struct SMB4ACL_T *nfs4_acl
-)
+static int nfs4_acl_add_sec_ace(bool is_directory,
+				const struct smbacl4_vfs_params *params,
+				uid_t ownerUID,
+				gid_t ownerGID,
+				const struct security_ace *ace_nt,
+				struct SMB4ACL_T *nfs4_acl)
 {
 	struct dom_sid_buf buf;
 	SMB_ACE4PROP_T nfs4_ace = { 0 };
@@ -936,9 +934,9 @@ static struct SMB4ACL_T *smbacl4_win2nfs4(
 	for(i=0; i<dacl->num_aces; i++) {
 		int ret;
 
-		ret = smbacl4_fill_ace4(is_directory, pparams,
-					ownerUID, ownerGID,
-					dacl->aces + i, theacl);
+		ret = nfs4_acl_add_sec_ace(is_directory, pparams,
+					   ownerUID, ownerGID,
+					   dacl->aces + i, theacl);
 		if (ret == -1) {
 			return NULL;
 		}