1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00

s4:netcmd/drs.py - use "objectClass" for discovering the server and it's NTDS settings object

Small optimisation: we don't need to look for "nTDSDSARO" since it's a subclass
of "ntDSDSA".

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sat Nov 27 23:35:13 CET 2010 on sn-devel-104
This commit is contained in:
Matthias Dieter Wallnöfer 2010-11-27 22:44:55 +01:00
parent 989d8803f2
commit b87c3703cf

View File

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