summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2017-02-11 19:34:09 +1300
committerAndrew Bartlett <abartlet@samba.org>2017-02-14 09:46:23 +0100
commitefef15a521a2f9fd2db27f2c8fbc7e110aef2796 (patch)
treeae2b498df5c472d322b1c47bcf7d0350263d25c6 /python
parent2a5d9e61db6605ef5f55a9a1d972a2a078d5c899 (diff)
downloadsamba-efef15a521a2f9fd2db27f2c8fbc7e110aef2796.tar.gz
join.py: Correctly print an error in DsAddEntry when .info is None
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'python')
-rw-r--r--python/samba/join.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/python/samba/join.py b/python/samba/join.py
index 60773c49a6c..058fa083bb4 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -492,8 +492,11 @@ class dc_join(object):
if ctr.err_ver != 1:
raise RuntimeError("expected err_ver 1, got %u" % ctr.err_ver)
if ctr.err_data.status[0] != werror.WERR_SUCCESS:
- print("DsAddEntry failed with status %s info %s" % (ctr.err_data.status,
- ctr.err_data.info.extended_err))
+ if ctr.err_data.info is None:
+ print("DsAddEntry failed with status %s, info omitted" % (ctr.err_data.status[1]))
+ else:
+ print("DsAddEntry failed with status %s info %s" % (ctr.err_data.status[1],
+ ctr.err_data.info.extended_err))
raise RuntimeError("DsAddEntry failed")
if ctr.err_data.dir_err != drsuapi.DRSUAPI_DIRERR_OK:
print("DsAddEntry failed with dir_err %u" % ctr.err_data.dir_err)