[SCM] Samba Shared Repository - branch master updated

Matthias Dieter Wallnöfer mdw at samba.org
Mon Nov 7 11:36:03 MST 2011


The branch, master has been updated
       via  ce8b5d5 s4:samba-tool - fix Gémes Géza patch regarding parameter handling
       via  1d9ff23 Add a --random-password option to user create command.
      from  b9e6c48 s3-wafbuild: Fix inotify detection (bug 8580)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ce8b5d520bafe10fb048f5c61197c840263decb6
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Nov 7 17:57:52 2011 +0100

    s4:samba-tool - fix Gémes Géza patch regarding parameter handling
    
    The new "random-password" parameter has not been evaluated correctly.
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Mon Nov  7 19:35:05 CET 2011 on sn-devel-104

commit 1d9ff23f8ea22d0a9b5efc4ed2565bfc0dc6d92e
Author: Gémes Géza <geza at kzsdabas.hu>
Date:   Wed Nov 2 15:33:35 2011 +0100

    Add a --random-password option to user create command.
    
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Signed-off-by: Matthias Dieter Wallnöfer <mdw at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/samba/netcmd/user.py |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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 cf0a1e7..0ac4b23 100644
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/source4/scripting/python/samba/netcmd/user.py
@@ -25,7 +25,7 @@ import sys, ldb
 from getpass import getpass
 from samba.auth import system_session
 from samba.samdb import SamDB
-from samba import gensec
+from samba import gensec, generate_random_password
 from samba.net import Net
 
 from samba.netcmd import (
@@ -71,6 +71,9 @@ Example3 shows how to create a new user in the OrgUnit organizational unit.
         Option("--must-change-at-next-login",
                 help="Force password to be changed on next login",
                 action="store_true"),
+        Option("--random-password",
+                help="Generate random password",
+                action="store_true"),
         Option("--use-username-as-cn",
                 help="Force use of username as user's CN",
                 action="store_true"),
@@ -97,12 +100,15 @@ 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,
+            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,
             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:
+            password = generate_random_password(128, 255)
+
         while 1:
             if password is not None and password is not '':
                 break
@@ -382,17 +388,24 @@ Example3 shows how an administrator would reset TestUser3 user's password to pas
         Option("--must-change-at-next-login",
                help="Force password to be changed on next login",
                action="store_true"),
+        Option("--random-password",
+                help="Generate random password",
+                action="store_true"),
         ]
 
     takes_args = ["username?"]
 
     def run(self, username=None, filter=None, credopts=None, sambaopts=None,
             versionopts=None, H=None, newpassword=None,
-            must_change_at_next_login=None):
+            must_change_at_next_login=None, random_password=None):
         if filter is None and username is None:
             raise CommandError("Either the username or '--filter' must be specified!")
 
-        password = newpassword
+        if random_password is True:
+            password = generate_random_password(128, 255)
+        else:
+            password = newpassword
+
         while 1:
             if password is not None and password is not '':
                 break


-- 
Samba Shared Repository


More information about the samba-cvs mailing list