From: Andrew Bartlett Date: Thu, 29 Feb 2024 23:14:58 +0000 (+1300) Subject: selftest: Ignore msKds-DomainID in ldapcmp_restoredc.sh and samba.tests.domain_backup... X-Git-Tag: tdb-1.4.11~1643 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02f18a88dad8d8cc6b15fc8f2ebde2560741e265;p=thirdparty%2Fsamba.git selftest: Ignore msKds-DomainID in ldapcmp_restoredc.sh and samba.tests.domain_backup_offline 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 Reviewed-by: Douglas Bagnall --- diff --git a/python/samba/tests/domain_backup_offline.py b/python/samba/tests/domain_backup_offline.py index 3b2f25283e5..a2e3ae347a4 100644 --- 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 508b0172091..606ef72dea1 100755 --- 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 }