summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-06-01 14:41:51 +1000
committerAndrew Tridgell <tridge@samba.org>2011-06-01 17:24:36 +1000
commit7b3d8b6c908a37bb06e413dee406cebd29b99b3e (patch)
treeb21e9adfc65bb8b0dbbf94d61c3057887ebdf077
parent23177b5f44815bc5b46943c70d37dc626ed60288 (diff)
downloadsamba-7b3d8b6c908a37bb06e413dee406cebd29b99b3e.tar.gz
samba-7b3d8b6c908a37bb06e413dee406cebd29b99b3e.tar.bz2
samba-7b3d8b6c908a37bb06e413dee406cebd29b99b3e.zip
samba-tool: improved user enable error handling
-rw-r--r--source4/scripting/python/samba/netcmd/user.py7
-rw-r--r--source4/scripting/python/samba/samdb.py2
2 files changed, 8 insertions, 1 deletions
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