sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

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

Browse Source 
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>
This commit is contained in:
Andrew Bartlett 2024-03-01 12:14:58 +13:00
parent 667265b685
commit 02f18a88da
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/tests/domain_backup_offline.py
View File

@ -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)

6
testprogs/blackbox/ldapcmp_restoredc.sh
View File

@ -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
}