nfs4_acls: Remove duplicate entries when mapping from NFS4 ACL to DACL

The previous patch added an additional entry for IDMAP_TYPE_BOTH. When
mapping back to a DACL, there should be no additional entry. Add a loop
that will check and remove entries that are exact duplicates.

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 f6be4cef1cbc8508531743ec017291b976b6bde8..ae0fb1f5efc57f4568db7aa08d31676817ce4331 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -297,6 +297,35 @@ static int smbacl4_fGetFileOwner(files_struct *fsp, SMB_STRUCT_STAT *psbuf)
        return 0;
 }
 
+static void check_for_duplicate_sec_ace(struct security_ace *nt_ace_list,
+                                       int *good_aces)
+{
+       struct security_ace *last = NULL;
+       int i;
+
+       if (*good_aces < 2) {
+               return;
+       }
+
+       last = &nt_ace_list[(*good_aces) - 1];
+
+       for (i = 0; i < (*good_aces) - 1; i++) {
+               struct security_ace *cur = &nt_ace_list[i];
+
+               if (cur->type == last->type &&
+                   cur->flags == last->flags &&
+                   cur->access_mask == last->access_mask &&
+                   dom_sid_equal(&cur->trustee, &last->trustee))
+               {
+                       struct dom_sid_buf sid_buf;
+
+                       DBG_INFO("Removing duplicate entry for SID %s.\n",
+                                dom_sid_str_buf(&last->trustee, &sid_buf));
+                       (*good_aces)--;
+               }
+       }
+}
+
 static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx,
        const struct smbacl4_vfs_params *params,
        struct SMB4ACL_T *acl, /* in */
@@ -438,6 +467,8 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx,
                                     ace->aceType, mask,
                                     win_ace_flags);
                }
+
+               check_for_duplicate_sec_ace(nt_ace_list, &good_aces);
        }
 
        nt_ace_list = talloc_realloc(mem_ctx, nt_ace_list, struct security_ace,