From 3ddd12668c6da95774abdf1977dc1e06a6d850f5 Mon Sep 17 00:00:00 2001 From: Rowland Penny Date: Mon, 23 Nov 2015 18:40:19 +0000 Subject: [PATCH] samba-tool: fsmo.py throws an uncaught exception if no fSMORoleOwner attribute This will fix bug 11613 where a user got the uncaught exception when trying to seize an FSMO role that didn't have the required attribute. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11613 Signed-off-by: Rowland Penny Reviewed-by: Jeremy Allison Reviewed-by: Uri Simchoni Autobuild-User(master): Uri Simchoni Autobuild-Date(master): Sun Dec 6 00:33:10 CET 2015 on sn-devel-104 (cherry picked from commit 4735e5f5e35bdff88bf59d56ecf1980cdabc3c83) --- python/samba/netcmd/fsmo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py index 0b4488f..3904bcb 100644 --- a/python/samba/netcmd/fsmo.py +++ b/python/samba/netcmd/fsmo.py @@ -38,7 +38,8 @@ def get_fsmo_roleowner(samdb, roledn): """ res = samdb.search(roledn, scope=ldb.SCOPE_BASE, attrs=["fSMORoleOwner"]) - assert len(res) == 1 + if len(res) == 0: + raise CommandError('"%s" does not have a FSMO roleowner' % roledn) master_owner = res[0]["fSMORoleOwner"][0] return master_owner -- 2.4.3