Merge v4.0-test

(This used to be commit 977dbdeaf363c8905ed9fd0570eba4be80582833)

1 files changed, 61 insertions, 80 deletions

diff --git a/source4/setup/newuser b/source4/setup/newuser
index 7c80e9e8de..03ae4e5ffb 100755
--- a/source4/setup/newuser
+++ b/source4/setup/newuser
@@ -1,80 +1,61 @@
-#!/bin/sh
-exec smbscript "$0" ${1+"$@"}
-/*
-	add a new user to a Samba4 server
-	Copyright Andrew Tridgell 2005
-	Released under the GNU GPL v2 or later
-*/
-
-options = GetOptions(ARGV,
-		"POPT_AUTOHELP",
-		'username=s',
-		'unixname=s',
-		'password=s',
-		"POPT_COMMON_SAMBA",
-		"POPT_COMMON_VERSION",
-		"POPT_COMMON_CREDENTIALS",
-		'quiet');
-
-if (options == undefined) {
-   println("Failed to parse options");
-   return -1;
-}
-
-libinclude("base.js");
-libinclude("provision.js");
-
-/*
-  print a message if quiet is not set
-*/
-function message() 
-{
-	if (options["quiet"] == undefined) {
-		print(vsprintf(arguments));
-	}
-}
-
-/*
- show some help
-*/
-function ShowHelp()
-{
-	print("
-Samba4 newuser
-
-newuser [options]
-  --username  USERNAME     choose new username
-  --unixname  USERNAME     choose unix name of new user
-  --password  PASSWORD     set password
-
-You must provide at least a username
-");
-	exit(1);
-}
-
-if (options['username'] == undefined) {
-	ShowHelp();
-}
-
-if (options['password'] == undefined) {
-	random_init(local);
-	options.password = randpass(12);
-	printf("chose random password %s\n", options.password);
-}
-if (options['unixname'] == undefined) {
-	options.unixname = options.username;
-}
-
-var nss = nss_init();
-if (nss.getpwnam(options.unixname) == undefined) {
-	printf("ERROR: Unix user '%s' does not exist\n", options.unixname);
-	exit(1);
-}
-
-var creds = options.get_credentials();
-var system_session = system_session();
-
-
-newuser(options.username, options.unixname, options.password, message, system_session, creds);
-
-return 0;
+#!/usr/bin/python
+#
+#	add a new user to a Samba4 server
+#	Copyright Andrew Tridgell 2005
+#	Copyright Jelmer Vernooij 2008
+#	Released under the GNU GPL v2 or later
+#
+
+import samba.getopt as options
+import optparse
+import pwd
+import sys
+
+from auth import system_session
+from samba.samdb import SamDB
+
+parser = optparse.OptionParser("newuser [options] <username> [<password>]")
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
+parser.add_option_group(options.VersionOptions(parser))
+credopts = options.CredentialsOptions(parser)
+parser.add_option_group(credopts)
+parser.add_option("--quiet", help="Be quiet", action="store_true")
+parser.add_option("--unixname", help="Unix Username", type=str)
+
+opts, args = parser.parse_args()
+
+#
+#  print a message if quiet is not set
+#
+def message(text):
+	if not opts.quiet:
+		print text
+
+if len(args) == 0:
+	parser.print_usage()
+	sys.exit(1)
+
+username = args[0]
+if len(args) > 1:
+	password = args[1]
+else:
+	random_init(local)
+	options.password = randpass(12)
+	print "chose random password %s\n" % password
+
+if opts.unixname is None:
+	opts.unixname = username
+
+try:
+	pwd.getpwnam(opts.unixname)
+except KeyError:
+	print "ERROR: Unix user '%s' does not exist" % opts.unixname
+	sys.exit(1)
+
+creds = credopts.get_credentials()
+
+lp = sambaopts.get_loadparm()
+samdb = SamDB(url=lp.get("sam database"), session_info=system_session(), 
+              credentials=creds, lp=lp)
+samdb.newuser(username, opts.unixname, password)