s4-net: better error message on net setpassword

diff --git a/source4/scripting/python/samba/netcmd/setpassword.py b/source4/scripting/python/samba/netcmd/setpassword.py
index e01fa23ab90219921337cd593c7830ed3cad4680..047a95afae2413741286d3d893e4757b14151d85 100644 (file)
--- a/source4/scripting/python/samba/netcmd/setpassword.py
+++ b/source4/scripting/python/samba/netcmd/setpassword.py
@@ -26,6 +26,7 @@ from getpass import getpass
 from samba.auth import system_session
 from samba.samdb import SamDB
 from samba import gensec
+import ldb
 
 class cmd_setpassword(Command):
     """(Re)sets the password on a user account"""
@@ -74,6 +75,7 @@ class cmd_setpassword(Command):
             samdb.setpassword(filter, password,
                               force_change_at_next_login=must_change_at_next_login,
                               username=username)
-        except:
-            raise CommandError('Failed to set password for user "%s"' %
-                username)
+        except ldb.LdbError, (num, msg):
+            raise CommandError('Failed to set password for user "%s" - %s' %
+                               (username, msg))
+        print "Changed password OK"