The branch, master has been updated via 099d687 s4:samba-tool user command - always initialise the boolean arguments properly via a53bc0a s4:samba-tool - other fix for Gémes Géza patch regarding parameter handling from 95595dd s3:libsmb: fix cli_write_and_x() against OS/2 print shares (bug #5326)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 099d687d1a5df7c88deced386df38e6e716ca053 Author: Matthias Dieter Wallnöfer <m...@samba.org> Date: Tue Nov 8 20:46:25 2011 +0100 s4:samba-tool user command - always initialise the boolean arguments properly It they haven't been specified. Reviewed-by: Jelmer Autobuild-User: Matthias Dieter Wallnöfer <m...@samba.org> Autobuild-Date: Tue Nov 8 22:28:38 CET 2011 on sn-devel-104 commit a53bc0a91bea89f0f284429c8fe2678891dd239b Author: Matthias Dieter Wallnöfer <m...@samba.org> Date: Mon Nov 7 17:57:52 2011 +0100 s4:samba-tool - other fix for Gémes Géza patch regarding parameter handling The condition has not been specified correctly since we are expecting a boolean. Pointed out by Jelmer. Reviewed-by: Jelmer ----------------------------------------------------------------------- Summary of changes: source4/scripting/python/samba/netcmd/user.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py index 0ac4b23..7072521 100644 --- a/source4/scripting/python/samba/netcmd/user.py +++ b/source4/scripting/python/samba/netcmd/user.py @@ -100,13 +100,13 @@ Example3 shows how to create a new user in the OrgUnit organizational unit. takes_args = ["username", "password?"] def run(self, username, password=None, credopts=None, sambaopts=None, - versionopts=None, H=None, must_change_at_next_login=None, random_password=None, - use_username_as_cn=None, userou=None, surname=None, given_name=None, initials=None, + versionopts=None, H=None, must_change_at_next_login=False, random_password=False, + use_username_as_cn=False, userou=None, surname=None, given_name=None, initials=None, profile_path=None, script_path=None, home_drive=None, home_directory=None, job_title=None, department=None, company=None, description=None, mail_address=None, internet_address=None, telephone_number=None, physical_delivery_office=None): - if random_password is True: + if random_password: password = generate_random_password(128, 255) while 1: @@ -397,11 +397,11 @@ Example3 shows how an administrator would reset TestUser3 user's password to pas def run(self, username=None, filter=None, credopts=None, sambaopts=None, versionopts=None, H=None, newpassword=None, - must_change_at_next_login=None, random_password=None): + must_change_at_next_login=False, random_password=False): if filter is None and username is None: raise CommandError("Either the username or '--filter' must be specified!") - if random_password is True: + if random_password: password = generate_random_password(128, 255) else: password = newpassword -- Samba Shared Repository