[SCM] Samba Shared Repository - branch master updated

[Uri Simchoni]

The branch, master has been updated
       via  4735e5f samba-tool: fsmo.py throws an uncaught exception if no
      from  dd9b12a ntlm_auth: Add --offline-logon

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4735e5f5e35bdff88bf59d56ecf1980cdabc3c83
Author: Rowland Penny <repenny241155 at gmail.com>
Date:   Mon Nov 23 18:40:19 2015 +0000

    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 <repenny241155 at gmail.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    Autobuild-User(master): Uri Simchoni <uri at samba.org>
    Autobuild-Date(master): Sun Dec  6 00:33:10 CET 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 python/samba/netcmd/fsmo.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

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
 


-- 
Samba Shared Repository