net: Move 'newuser' to 'net newuser'

Signed-off-by: Andrew Tridgell <tridge@samba.org>

3 files changed, 12 insertions, 78 deletions

diff --git a/source4/setup/newuser b/source4/setup/newuser
deleted file mode 100755
index ef65d36dfb..0000000000
--- a/source4/setup/newuser
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/python
-#
-# Adds a new user to a Samba4 server
-# Copyright Jelmer Vernooij 2008
-#
-# Based on the original in EJS:
-# Copyright Andrew Tridgell 2005
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#   
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#   
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-
-# Find right directory when running from source tree
-sys.path.insert(0, "bin/python")
-
-import samba.getopt as options
-import optparse
-
-from getpass import getpass
-from samba.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("-H", help="LDB URL for database or target server", type=str)
-parser.add_option("--unixname", help="Unix Username", type=str)
-parser.add_option("--must-change-at-next-login", help="Force password to be changed on next login", action="store_true")
-
-opts, args = parser.parse_args()
-
-if len(args) == 0:
-	parser.print_usage()
-	sys.exit(1)
-
-username = args[0]
-if len(args) > 1:
-	password = args[1]
-else:
-	password = getpass("New Password: ")
-
-if opts.unixname is None:
-	opts.unixname = username
-
-lp = sambaopts.get_loadparm()
-creds = credopts.get_credentials(lp)
-
-if opts.H is not None:
-	url = opts.H
-else:
-	url = lp.get("sam database")
-
-samdb = SamDB(url=url, session_info=system_session(), credentials=creds, lp=lp)
-
-samdb.newuser(username, opts.unixname, password, force_password_change_at_next_login_req=opts.must_change_at_next_login)
diff --git a/source4/setup/tests/blackbox_newuser.sh b/source4/setup/tests/blackbox_newuser.sh
index d25c70669b..30e6830be5 100755
--- a/source4/setup/tests/blackbox_newuser.sh
+++ b/source4/setup/tests/blackbox_newuser.sh
@@ -14,19 +14,20 @@ shift 1
 
 
 testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
+net="./bin/net"
 
 CONFIG="--configfile=$PREFIX/simple-dc/etc/smb.conf"
 
-testit "newuser" $PYTHON ./setup/newuser $CONFIG testuser testpass
+testit "newuser" $net newuser $CONFIG testuser testpass
 
 # check the enable account script
-testit "enableaccount" $PYTHON ./setup/enableaccount $CONFIG testuser
+testit "enableaccount" $net enableaccount $CONFIG testuser
 
 # check the enable account script
-testit "setpassword" $PYTHON ./setup/setpassword $CONFIG testuser --newpassword=testpass2
+testit "setpassword" $net setpassword $CONFIG testuser --newpassword=testpass2
 
 # check the setexpiry script
-testit "noexpiry" $PYTHON ./setup/setexpiry $CONFIG testuser --noexpiry
-testit "expiry" $PYTHON ./setup/setexpiry $CONFIG testuser --days=7
+testit "noexpiry" $net setexpiry $CONFIG testuser --noexpiry
+testit "expiry" $net setexpiry $CONFIG testuser --days=7
 
 exit $failed
diff --git a/source4/setup/tests/blackbox_setpassword.sh b/source4/setup/tests/blackbox_setpassword.sh
index 77b41a2424..9f8fa6d2c1 100755
--- a/source4/setup/tests/blackbox_setpassword.sh
+++ b/source4/setup/tests/blackbox_setpassword.sh
@@ -12,14 +12,16 @@ shift 1
 
 . `dirname $0`/../../../testprogs/blackbox/subunit.sh
 
+net="./bin/net"
+
 testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
 
-testit "newuser" $PYTHON ./setup/newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testpass
+testit "newuser" $net newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testpass
 
-testit "setpassword" $PYTHON ./setup/setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testpass
+testit "setpassword" $net setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testpass
 
-testit "setpassword" $PYTHON ./setup/setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testpass --must-change-at-next-login
+testit "setpassword" $net setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testpass --must-change-at-next-login
 
-testit "pwsettings" $PYTHON ./setup/pwsettings --quiet set --configfile=$PREFIX/simple-dc/etc/smb.conf --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=default --max-pwd-age=default
+testit "pwsettings" $net pwsettings --quiet set --configfile=$PREFIX/simple-dc/etc/smb.conf --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=default --max-pwd-age=default
 
 exit $failed