From 0efc061a62af0a315982ce21cab2f2fd32f43d1d Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Mon, 18 Dec 2017 12:39:52 +1300 Subject: [PATCH] ldapcmp: Add otherWellKnownObjects to ignore when using --two wellKnownObjects already exists in this list. Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett --- python/samba/netcmd/ldapcmp.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py index cb02de2bd27..0b81189f38d 100644 --- a/python/samba/netcmd/ldapcmp.py +++ b/python/samba/netcmd/ldapcmp.py @@ -454,12 +454,17 @@ class LDAPObject(object): if self.two_domains: self.ignore_attributes += [ - "objectCategory", "objectGUID", "objectSid", "whenCreated", "whenChanged", "pwdLastSet", "uSNCreated", "creationTime", - "modifiedCount", "priorSetTime", "rIDManagerReference", "gPLink", "ipsecNFAReference", - "fRSPrimaryMember", "fSMORoleOwner", "masteredBy", "ipsecOwnersReference", "wellKnownObjects", - "badPwdCount", "ipsecISAKMPReference", "ipsecFilterReference", "msDs-masteredBy", "lastSetTime", - "ipsecNegotiationPolicyReference", "subRefs", "gPCFileSysPath", "accountExpires", "invocationId", - "operatingSystemVersion", "oEMInformation", + "objectCategory", "objectGUID", "objectSid", "whenCreated", + "whenChanged", "pwdLastSet", "uSNCreated", "creationTime", + "modifiedCount", "priorSetTime", "rIDManagerReference", + "gPLink", "ipsecNFAReference", "fRSPrimaryMember", + "fSMORoleOwner", "masteredBy", "ipsecOwnersReference", + "wellKnownObjects", "otherWellKnownObjects", "badPwdCount", + "ipsecISAKMPReference", "ipsecFilterReference", + "msDs-masteredBy", "lastSetTime", + "ipsecNegotiationPolicyReference", "subRefs", "gPCFileSysPath", + "accountExpires", "invocationId", "operatingSystemVersion", + "oEMInformation", # After Exchange preps "targetAddress", "msExchMailboxGuid", "siteFolderGUID"] # -- 2.47.3