sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-19 12:23:49 +03:00
Code Activity

python/samba/netcmd: PY3 port for samba4.drs.samba_tool_drs_showrepl

Browse Source 
Fix various ldb.bytes that need to be stringified in order to get
tests to pass

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power
2018-11-20 16:20:49 +00:00
committed by Noel Power
parent f8c05eb75a
commit 06ef2d51a1
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ from samba.uptodateness import (
get_utdv_summary, get_utdv_summary,
get_kcc_and_dsas, get_kcc_and_dsas,
) )
from samba.compat import get_string
def drsuapi_connect(ctx): def drsuapi_connect(ctx):
'''make a DRSUAPI connection to the server''' '''make a DRSUAPI connection to the server'''
@@ -278,10 +278,10 @@ class cmd_drs_showrepl(Command):
dsa_details = { dsa_details = {
"options": int(attr_default(ntds[0], "options", 0)), "options": int(attr_default(ntds[0], "options", 0)),
"objectGUID": self.samdb.schema_format_value( "objectGUID": get_string(self.samdb.schema_format_value(
"objectGUID", ntds[0]["objectGUID"][0]), "objectGUID", ntds[0]["objectGUID"][0])),
"invocationId": self.samdb.schema_format_value( "invocationId": get_string(self.samdb.schema_format_value(
"objectGUID", ntds[0]["invocationId"][0]) "objectGUID", ntds[0]["invocationId"][0]))
} }
conn = self.samdb.search(base=ntds_dn, expression="(objectClass=nTDSConnection)") conn = self.samdb.search(base=ntds_dn, expression="(objectClass=nTDSConnection)")
@@ -290,13 +290,13 @@ class cmd_drs_showrepl(Command):
conn_details = [] conn_details = []
for c in conn: for c in conn:
c_rdn, sep, c_server_dn = c['fromServer'][0].partition(',') c_rdn, sep, c_server_dn = str(c['fromServer'][0]).partition(',')
d = { d = {
'name': str(c['name']), 'name': str(c['name']),
'remote DN': c['fromServer'][0], 'remote DN': str(c['fromServer'][0]),
'options': int(attr_default(c, 'options', 0)), 'options': int(attr_default(c, 'options', 0)),
'enabled': (attr_default(c, 'enabledConnection', 'enabled': (get_string(attr_default(c, 'enabledConnection',
'TRUE').upper() == 'TRUE') 'TRUE')).upper() == 'TRUE')
} }
conn_details.append(d) conn_details.append(d)
@@ -304,7 +304,7 @@ class cmd_drs_showrepl(Command):
c_server_res = self.samdb.search(base=c_server_dn, c_server_res = self.samdb.search(base=c_server_dn,
scope=ldb.SCOPE_BASE, scope=ldb.SCOPE_BASE,
attrs=["dnsHostName"]) attrs=["dnsHostName"])
d['dns name'] = c_server_res[0]["dnsHostName"][0] d['dns name'] = str(c_server_res[0]["dnsHostName"][0])
except ldb.LdbError as e: except ldb.LdbError as e:
(errno, _) = e.args (errno, _) = e.args
if errno == ldb.ERR_NO_SUCH_OBJECT: if errno == ldb.ERR_NO_SUCH_OBJECT: