From ce55d7c9f0c0720f765f549f9b2617cb9a3d2299 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sun, 28 Nov 2010 12:54:02 +0100 Subject: Revert "s4:netcmd/drs.py - use "objectClass" for discovering the server and it's NTDS settings object" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b87c3703cf890bd55340a201536073bd2be1e1d8. Andrew Bartlett told me that exactly the opposite is true - the "objectCategory" lookup is performing better. Autobuild-User: Matthias Dieter Wallnöfer Autobuild-Date: Sun Nov 28 14:18:41 CET 2010 on sn-devel-104 --- source4/scripting/python/samba/netcmd/drs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/scripting/python/samba/netcmd/drs.py b/source4/scripting/python/samba/netcmd/drs.py index 681679091d..387524b943 100644 --- a/source4/scripting/python/samba/netcmd/drs.py +++ b/source4/scripting/python/samba/netcmd/drs.py @@ -260,7 +260,7 @@ class cmd_drs_replicate(Command): # we need to find the NTDS GUID of the source DC msg = self.samdb.search(base=self.samdb.get_config_basedn(), - expression="(&(objectClass=server)(|(name=%s)(dNSHostName=%s)))" % (SOURCE_DC, + expression="(&(objectCategory=server)(|(name=%s)(dNSHostName=%s)))" % (SOURCE_DC, SOURCE_DC), attrs=[]) if len(msg) == 0: @@ -268,7 +268,7 @@ class cmd_drs_replicate(Command): server_dn = msg[0]['dn'] msg = self.samdb.search(base=server_dn, scope=ldb.SCOPE_ONELEVEL, - expression="(objectClass=nTDSDSA)", + expression="(|(objectCategory=nTDSDSA)(objectCategory=nTDSDSARO))", attrs=['objectGUID', 'options']) if len(msg) == 0: raise CommandError("Failed to find source NTDS DN %s" % SOURCE_DC) -- cgit