diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2017-12-18 12:39:52 +1300 |
|---|---|---|
| committer | Garming Sam <garming@samba.org> | 2017-12-20 23:13:11 +0100 |
| commit | 0efc061a62af0a315982ce21cab2f2fd32f43d1d (patch) | |
| tree | 9d5ecc66ce1d7a1b7f73702433e9e1a51edd1b06 | |
| parent | 83c4c3b3979b057d96e7bfaeb41f095d7cf4f6a9 (diff) | |
| download | samba-0efc061a62af0a315982ce21cab2f2fd32f43d1d.tar.gz | |
ldapcmp: Add otherWellKnownObjects to ignore when using --two
wellKnownObjects already exists in this list.
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | python/samba/netcmd/ldapcmp.py | 17 |
1 files 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"] # |