From 7b3d8b6c908a37bb06e413dee406cebd29b99b3e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 1 Jun 2011 14:41:51 +1000
Subject: samba-tool: improved user enable error handling

---
 source4/scripting/python/samba/netcmd/user.py | 7 ++++++-
 source4/scripting/python/samba/samdb.py       | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'source4')

diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py
index 696c8892cf..15be4bb87f 100644
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/source4/scripting/python/samba/netcmd/user.py
@@ -108,7 +108,12 @@ class cmd_user_enable(Command):
 
         samdb = SamDB(url=H, session_info=system_session(),
             credentials=creds, lp=lp)
-        samdb.enable_account(filter)
+        try:
+            samdb.enable_account(filter)
+        except Exception, msg:
+            raise CommandError("Failed to enable user %s: %s" % (username or filter, msg))
+        print("Enabled user %s" % (username or filter))
+
 
 class cmd_user_setexpiry(Command):
     """Sets the expiration of a user account"""
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 99f141e664..2cea198e6b 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -79,6 +79,8 @@ class SamDB(samba.Ldb):
         """
         res = self.search(base=self.domain_dn(), scope=ldb.SCOPE_SUBTREE,
                           expression=search_filter, attrs=["userAccountControl"])
+        if len(res) == 0:
+                raise Exception('Unable to find user "%s"' % search_filter)
         assert(len(res) == 1)
         user_dn = res[0].dn
 
-- 
cgit