join: Fix TypeError when handling exception
authorTim Beale <timbeale@catalyst.net.nz>
Wed, 16 Jan 2019 02:17:38 +0000 (15:17 +1300)
committerKarolin Seeger <kseeger@samba.org>
Tue, 5 Feb 2019 19:41:24 +0000 (20:41 +0100)
commit334f1e6f56a10097ce918620dc484e9eb0a5b83b
tree12c2379c489fc97662365cf2e8b974218af14a54
parent9ae7ffa5f053c5f39691dd881d1adb290859bcad
join: Fix TypeError when handling exception

When we can't resolve a domain name, we were inadvertently throwing a
TypeError whilst trying to output a helpful message. E.g.

ERROR(<class 'TypeError'>): uncaught exception - 'NTSTATUSError' object
does not support indexing

Instead of indexing the object, we want to index the Exception.args so
that we just display the string portion of the exception error.

The same problem is also present for the domain trust commands.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13747

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Rowland Penny <rpenny@samba.org>
Reviewed-by: Jeremy Allison <rpenny@samba.org>
(cherry picked from commit 3bb7808984c163a7bba66fb983411d1281589722)
python/samba/join.py
python/samba/netcmd/domain.py