s4:net utility - add an optional password attribute to "net user add"

To make it behave similar to "net newuser".

diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py
index 7597f462b659528a19fe391e4c544423c9d10c2c..54ddfe232281efea090e5ce1fb12cf0c53ee02dd 100644 (file)
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/source4/scripting/python/samba/netcmd/user.py
@@ -29,7 +29,7 @@ from samba.netcmd import (
 
 class cmd_user_add(Command):
     """Create a new user."""
-    synopsis = "%prog user add <name>"
+    synopsis = "%prog user add <name> [<password>]"
 
     takes_optiongroups = {
         "sambaopts": options.SambaOptions,
@@ -37,13 +37,15 @@ class cmd_user_add(Command):
         "versionopts": options.VersionOptions,
         }
 
-    takes_args = ["name"]
+    takes_args = ["name", "password?"]
 
-    def run(self, name, credopts=None, sambaopts=None, versionopts=None):
+    def run(self, name, password=None, credopts=None, sambaopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp)
         net = Net(creds, lp)
         net.create_user(name)
+        if password is not None:
+            net.set_password(name, creds.get_domain(), password, creds)
 
 
 class cmd_user_delete(Command):