From ccb1beb9a30a413fcf5b85b273b789db15b6be56 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 3 Sep 2013 17:41:42 +1200 Subject: join.py: Handle exceptions when looking for GUID in a DN Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher --- python/samba/join.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'python') diff --git a/python/samba/join.py b/python/samba/join.py index b2f4da4790..cad228a71a 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -303,7 +303,11 @@ class dc_join(object): scope=ldb.SCOPE_BASE, controls=["extended_dn:1:1"]) if not 'fSMORoleOwner' in res[0]: raise DCJoinException("Can't find naming master on partition DN %s" % ctx.partition_dn) - master_guid = str(misc.GUID(ldb.Dn(ctx.samdb, res[0]['fSMORoleOwner'][0]).get_extended_component('GUID'))) + try: + master_guid = str(misc.GUID(ldb.Dn(ctx.samdb, res[0]['fSMORoleOwner'][0]).get_extended_component('GUID'))) + except KeyError: + raise DCJoinException("Can't find GUID in naming master on partition DN %s" % res[0]['fSMORoleOwner'][0]) + master_host = '%s._msdcs.%s' % (master_guid, ctx.dnsforest) return master_host -- cgit