From b87c3703cf890bd55340a201536073bd2be1e1d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Sat, 27 Nov 2010 22:44:55 +0100 Subject: [PATCH] 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=utf8 Content-Transfer-Encoding: 8bit Small optimisation: we don't need to look for "nTDSDSARO" since it's a subclass of "ntDSDSA". Autobuild-User: Matthias Dieter Wallnöfer Autobuild-Date: Sat Nov 27 23:35:13 CET 2010 on sn-devel-104 --- source4/scripting/python/samba/netcmd/drs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source4/scripting/python/samba/netcmd/drs.py b/source4/scripting/python/samba/netcmd/drs.py index 7c4b1713b11..e7a631b6a79 100644 --- a/source4/scripting/python/samba/netcmd/drs.py +++ b/source4/scripting/python/samba/netcmd/drs.py @@ -258,7 +258,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="(&(objectCategory=server)(|(name=%s)(dNSHostName=%s)))" % (SOURCE_DC, + expression="(&(objectClass=server)(|(name=%s)(dNSHostName=%s)))" % (SOURCE_DC, SOURCE_DC), attrs=[]) if len(msg) == 0: @@ -266,7 +266,7 @@ class cmd_drs_replicate(Command): server_dn = msg[0]['dn'] msg = self.samdb.search(base=server_dn, scope=ldb.SCOPE_ONELEVEL, - expression="(|(objectCategory=nTDSDSA)(objectCategory=nTDSDSARO))", + expression="(objectClass=nTDSDSA)", attrs=['objectGUID', 'options']) if len(msg) == 0: raise CommandError("Failed to find source NTDS DN %s" % SOURCE_DC) -- 2.11.4.GIT