sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-25 00:59:11 +03:00
Code Activity

s4/samba-tool/drs: Move get_dsServiceName function at module level to be re-used

Browse Source
This commit is contained in:
Kamen Mazdrashki
2011-02-07 14:13:06 +02:00
parent f3db67e14f
commit ad48c70db6
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source4/scripting/python/samba/netcmd/drs.py
View File

@ -83,6 +83,12 @@ def drs_parse_ntds_dn(ntds_dn):
return (site, server)
def get_dsServiceName(samdb):
'''get the NTDS DN from the rootDSE'''
res = samdb.search(base="", scope=ldb.SCOPE_BASE, attrs=["dsServiceName"])
return res[0]["dsServiceName"][0]
class cmd_drs_showrepl(Command):
"""show replication status"""
@ -110,11 +116,6 @@ class cmd_drs_showrepl(Command):
print("\t\tLast success @ %s" % nttime2string(n.last_success))
print("")
def get_dsServiceName(ctx):
'''get the NTDS DN from the rootDSE'''
res = ctx.samdb.search(base="", scope=ldb.SCOPE_BASE, attrs=["dsServiceName"])
return res[0]["dsServiceName"][0]
def drsuapi_ReplicaInfo(ctx, info_type):
'''call a DsReplicaInfo'''
@ -140,7 +141,7 @@ class cmd_drs_showrepl(Command):
samdb_connect(self)
# show domain information
ntds_dn = self.get_dsServiceName()
ntds_dn = get_dsServiceName(self.samdb)
server_dns = self.samdb.search(base="", scope=ldb.SCOPE_BASE, attrs=["dnsHostName"])[0]['dnsHostName'][0]
(site, server) = drs_parse_ntds_dn(ntds_dn)
@ -424,11 +425,6 @@ class cmd_drs_options(Command):
"DISABLE_OUTBOUND_REPL": 0x00000004,
"DISABLE_NTDSCONN_XLATE": 0x00000008}
def get_dsServiceName(ctx):
'''get the NTDS DN from the rootDSE'''
res = ctx.samdb.search(base="", scope=ldb.SCOPE_BASE, attrs=["dsServiceName"])
return res[0]["dsServiceName"][0]
def run(self, DC, dsa_option=None,
sambaopts=None, credopts=None, versionopts=None):
@ -440,7 +436,7 @@ class cmd_drs_options(Command):
samdb_connect(self)
ntds_dn = self.get_dsServiceName()
ntds_dn = get_dsServiceName(self.samdb)
res = self.samdb.search(base=ntds_dn, scope=ldb.SCOPE_BASE, attrs=["options"])
dsa_opts = int(res[0]["options"][0])