diff options
| author | Noel Power <noel.power@suse.com> | 2018-11-20 16:20:49 +0000 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2018-12-10 10:38:24 +0100 |
| commit | 06ef2d51a1b48952e7c443504cf03cbea2716ad1 (patch) | |
| tree | 25a6326b31554933dca3564d3866b251671c4ea6 | |
| parent | f8c05eb75a57649b3865d3d95bdaabfd14640c97 (diff) | |
| download | samba-06ef2d51a1b48952e7c443504cf03cbea2716ad1.tar.gz | |
python/samba/netcmd: PY3 port for samba4.drs.samba_tool_drs_showrepl
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>
| -rw-r--r-- | python/samba/netcmd/drs.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py index c937c70eb66..e6b892c2877 100644 --- a/python/samba/netcmd/drs.py +++ b/python/samba/netcmd/drs.py @@ -46,7 +46,7 @@ from samba.uptodateness import ( get_utdv_summary, get_kcc_and_dsas, ) - +from samba.compat import get_string def drsuapi_connect(ctx): '''make a DRSUAPI connection to the server''' @@ -278,10 +278,10 @@ class cmd_drs_showrepl(Command): dsa_details = { "options": int(attr_default(ntds[0], "options", 0)), - "objectGUID": self.samdb.schema_format_value( - "objectGUID", ntds[0]["objectGUID"][0]), - "invocationId": self.samdb.schema_format_value( - "objectGUID", ntds[0]["invocationId"][0]) + "objectGUID": get_string(self.samdb.schema_format_value( + "objectGUID", ntds[0]["objectGUID"][0])), + "invocationId": get_string(self.samdb.schema_format_value( + "objectGUID", ntds[0]["invocationId"][0])) } conn = self.samdb.search(base=ntds_dn, expression="(objectClass=nTDSConnection)") @@ -290,13 +290,13 @@ class cmd_drs_showrepl(Command): conn_details = [] 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 = { 'name': str(c['name']), - 'remote DN': c['fromServer'][0], + 'remote DN': str(c['fromServer'][0]), 'options': int(attr_default(c, 'options', 0)), - 'enabled': (attr_default(c, 'enabledConnection', - 'TRUE').upper() == 'TRUE') + 'enabled': (get_string(attr_default(c, 'enabledConnection', + 'TRUE')).upper() == 'TRUE') } conn_details.append(d) @@ -304,7 +304,7 @@ class cmd_drs_showrepl(Command): c_server_res = self.samdb.search(base=c_server_dn, scope=ldb.SCOPE_BASE, 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: (errno, _) = e.args if errno == ldb.ERR_NO_SUCH_OBJECT: |