selftest: Ignore msKds-DomainID in ldapcmp_restoredc.sh and samba.tests.domain_backup...

Like serverReferenceBL etc, this will point to a DC that created the object, and
as part of the backup and restore, this DC will be deleted.  It is just for
tracking the object creation, so this is fine.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/tests/domain_backup_offline.py b/python/samba/tests/domain_backup_offline.py
index 3b2f25283e5f1bbd981e2d14015f4dd32e9085e7..a2e3ae347a4297df2758f80f6cc3b81ea083ec53 100644 (file)
--- a/python/samba/tests/domain_backup_offline.py
+++ b/python/samba/tests/domain_backup_offline.py
@@ -133,7 +133,7 @@ class DomainBackupOfflineCmp(BlackboxTestCase):
                         "localPolicyFlags", "operatingSystem", "displayName",
                         "dnsRecord", "dNSTombstoned",
                         "msDS-NC-Replica-Locations", "msDS-HasInstantiatedNCs",
-                        "interSiteTopologyGenerator"]
+                        "interSiteTopologyGenerator", "msKds-DomainID"]
         filter_arg = "--filter=" + ",".join(ignore_attrs)
         args = ["--two", filter_arg]
         self.ldapcmp(self.prov_dir, self.extract_dir, args)

diff --git a/testprogs/blackbox/ldapcmp_restoredc.sh b/testprogs/blackbox/ldapcmp_restoredc.sh
index 508b01720918f2eb6cb761b6bde32b16d4026455..606ef72dea113eaf640281dd82c8a51905e09d92 100755 (executable)
--- a/testprogs/blackbox/ldapcmp_restoredc.sh
+++ b/testprogs/blackbox/ldapcmp_restoredc.sh
@@ -63,6 +63,12 @@ ldapcmp_with_orig()
        # the restored DC may use a different side compared to the original DC
        IGNORE_ATTRS="$IGNORE_ATTRS,serverReferenceBL,msDS-IsDomainFor"
 
+       # Like serverReferenceBL etc, this will point to a DC that
+       # created the object, and as part of the backup and restore,
+       # this DC will be deleted.  It is just for tracking the object
+       # creation, so this is fine.
+       IGNORE_ATTRS="$IGNORE_ATTRS,msKds-DomainID"
+
        LDAPCMP_CMD="$PYTHON $BINDIR/samba-tool ldapcmp"
        $LDAPCMP_CMD $DB1_PATH $DB2_PATH --two --skip-missing-dn --filter=$IGNORE_ATTRS $BASE_DN_OPTS
 }