From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Fri, 4 Dec 2020 00:06:25 +0000 (+1300)
Subject: dbcheck: do not add duplicate attrs for checking
X-Git-Tag: samba-4.14.0rc1~431
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b21287c2f4922abb76ead510680bd489c6cf3cf9;p=thirdparty%2Fsamba.git

dbcheck: do not add duplicate attrs for checking

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
---

diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index 485b57139c4..bf5c184f4d0 100644
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -2236,9 +2236,11 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
             lc_attrs.add('name')
 
         if 'name' in lc_attrs:
-            attrs.append(dn.get_rdn_name())
-            attrs.append("isDeleted")
-            attrs.append("systemFlags")
+            for a in (dn.get_rdn_name(),
+                      "isDeleted",
+                      "systemFlags"):
+                if a.lower() not in lc_attrs:
+                    attrs.append(a)
 
         need_replPropertyMetaData = False
         if '*' in lc_attrs: