join.py: Handle more error cases with useful exceptions

[nivanova/samba-autobuild/.git] / python / samba / join.py

diff --git a/python/samba/join.py b/python/samba/join.py
index ff0fe3bdfb8302bea632d7d5abf5b82c9cb43e58..4f2d27343c5f393febcd5831081bb94b4a8d527f 100644 (file)
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -748,7 +748,15 @@ class dc_join(object):
         print("Finding domain GUID from ncName")
         res = ctx.local_samdb.search(base=ctx.partition_dn, scope=ldb.SCOPE_BASE, attrs=['ncName'],
                                      controls=["extended_dn:1:1", "reveal_internals:0"])
-        domguid = str(misc.GUID(ldb.Dn(ctx.samdb, res[0]['ncName'][0]).get_extended_component('GUID')))
+
+        if 'nCName' not in res[0]:
+            raise DCJoinException("Can't find naming context on partition DN %s in %s" % (ctx.partition_dn, ctx.samdb.url))
+
+        try:
+            domguid = str(misc.GUID(ldb.Dn(ctx.samdb, res[0]['ncName'][0]).get_extended_component('GUID')))
+        except KeyError:
+            raise DCJoinException("Can't find GUID in naming master on partition DN %s" % res[0]['ncName'][0])
+
         print("Got domain GUID %s" % domguid)
 
         print("Calling own domain provision")