diff options
author | Christof Schmitt <cs@samba.org> | 2019-07-18 11:49:29 -0700 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2019-08-26 10:23:28 +0000 |
commit | b4b61724550c2022ebb0e212aff4c844a2862f22 (patch) | |
tree | dedd29fdd68cd112c4455de167a461c063392a7f | |
parent | 657f79f859492be9f9b21481cb9326fc2c9914a7 (diff) | |
download | samba-b4b61724550c2022ebb0e212aff4c844a2862f22.tar.gz |
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)
-rw-r--r-- | source3/modules/nfs4_acls.c | 20 |
1 files changed, 9 insertions, 11 deletions
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; } |