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>

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 485fd784aa030e3522f136b662dfaf083ae257a0..f6be4cef1cbc8508531743ec017291b976b6bde8 100644 (file)
--- 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 };
@@ -934,9 +932,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;
                }