sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-19 04:59:10 +03:00
Code Activity

s4-net: nicer error message (and no exception)

Browse Source 
in net newuser and net setpasswd we shouldn't be throwing python
exceptions on normal user errors like unknown user

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andrew Tridgell
2010-04-15 17:14:46 +10:00
parent 22d7a06522
commit 046c5824e4
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source4/scripting/python/samba/netcmd/setpassword.py
View File

@ -22,7 +22,7 @@
import samba.getopt as options
from samba.netcmd import Command, CommandError, Option
import sys
from getpass import getpass
from samba.auth import system_session
from samba.samdb import SamDB
@ -68,5 +68,11 @@ class cmd_setpassword(Command):
samdb = SamDB(url=H, session_info=system_session(),
credentials=creds, lp=lp)
samdb.setpassword(filter, password,
force_change_at_next_login=must_change_at_next_login)
try:
samdb.setpassword(filter, password,
force_change_at_next_login=must_change_at_next_login,
username=username)
except:
print('Failed to set password for user "%s"' % username)
sys.exit(1)