sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

net: Move 'newuser' to 'net newuser'

Browse Source 
Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Jelmer Vernooij 2009-12-30 20:40:11 +01:00 committed by Andrew Tridgell
parent 73594c248f
commit 9e5ef916d4
8 changed files with 95 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/script/installmisc.sh
View File

@ -49,7 +49,7 @@ cp setup/ad-schema/*.txt $SETUPDIR/ad-schema || exit 1
cp setup/display-specifiers/*.txt $SETUPDIR/display-specifiers || exit 1
echo "Installing sbin scripts from setup/*"
for p in enableaccount newuser provision
for p in provision
do
cp setup/$p $SBINDIR || exit 1
chmod a+x $SBINDIR/$p

15
source4/scripting/python/samba/netcmd/__init__.py
View File

@ -81,12 +81,15 @@ class Command(object):
for option in option_group.option_list:
del kwargs[option.dest]
kwargs.update(optiongroups)
min_args = 0
max_args = 0
for i, arg in enumerate(self.takes_args):
if arg[-1] != "?":
if len(args) < i:
self.usage(args)
return -1
if len(args) > len(self.takes_args):
if arg[-1] not in ("?", "*"):
min_args += 1
max_args += 1
if arg[-1] == "*":
max_args = -1
if len(args) < min_args or (max_args != -1 and len(args) > max_args):
self.usage(args)
return -1
try:
@ -137,3 +140,5 @@ from samba.netcmd.setexpiry import cmd_setexpiry
commands["setexpiry"] = cmd_setexpiry()
from samba.netcmd.enableaccount import cmd_enableaccount
commands["enableaccount"] = cmd_enableaccount()
from samba.netcmd.newuser import cmd_newuser
commands["newuser"] = cmd_newuser()

70
source4/scripting/python/samba/netcmd/newuser.py Executable file
View File

@ -0,0 +1,70 @@
#!/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 samba.getopt as options
from samba.netcmd import Command, CommandError, Option
from getpass import getpass
from samba.auth import system_session
from samba.samdb import SamDB
class cmd_newuser(Command):
"""Create a new user."""
synopsis = "newuser [options] <username> [<password>]"
takes_optiongroups = {
"sambaopts": options.SambaOptions,
"versionopts": options.VersionOptions,
"credopts": options.CredentialsOptions,
}
takes_options = [
Option("-H", help="LDB URL for database or target server", type=str),
Option("--unixname", help="Unix Username", type=str),
Option("--must-change-at-next-login",
help="Force password to be changed on next login",
action="store_true"),
]
takes_args = ["username", "password?"]
def run(self, username, password=None, credopts=None, sambaopts=None,
versionopts=None, H=None, unixname=None,
must_change_at_next_login=None):
if password is None:
password = getpass("New Password: ")
if unixname is None:
unixname = username
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp)
if H is not None:
url = H
else:
url = lp.get("sam database")
samdb = SamDB(url=url, session_info=system_session(), credentials=creds,
lp=lp)
samdb.newuser(username, unixname, password,
force_password_change_at_next_login_req=must_change_at_next_login)

69
source4/setup/newuser
View File

@ -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)

11
source4/setup/tests/blackbox_newuser.sh
View File

@ -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

10
source4/setup/tests/blackbox_setpassword.sh
View File

@ -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

2
testprogs/blackbox/test_export_keytab.sh
View File

@ -22,7 +22,7 @@ samba4bindir="$BUILDDIR/bin"
smbclient="$samba4bindir/smbclient$EXEEXT"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT"
net="$samba4bindir/net$EXEEXT"
newuser="$PYTHON `dirname $0`/../../source4/setup/newuser"
newuser="$net newuser"
. `dirname $0`/subunit.sh

2
testprogs/blackbox/test_passwords.sh
View File

@ -25,7 +25,7 @@ samba4kinit="$samba4bindir/samba4kinit$EXEEXT"
net="$samba4bindir/net$EXEEXT"
rkpty="$samba4bindir/rkpty$EXEEXT"
samba4kpasswd="$samba4bindir/samba4kpasswd$EXEEXT"
newuser="$PYTHON `dirname $0`/../../source4/setup/newuser"
newuser="$net newuser"
. `dirname $0`/subunit.sh