From 73594c248f35a6ebbe391cc46b717aff14d393be Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 30 Dec 2009 20:10:34 +0100 Subject: [PATCH] net: Fix tests and documentation of setexpiry. Signed-off-by: Andrew Tridgell --- source4/scripting/python/samba/netcmd/__init__.py | 2 + .../netcmd/{setexpiry.py => enableaccount.py} | 22 +++----- source4/scripting/python/samba/netcmd/setexpiry.py | 1 + source4/setup/enableaccount | 65 ---------------------- testprogs/blackbox/test_kinit.sh | 2 +- testprogs/blackbox/test_passwords.sh | 1 - 6 files changed, 12 insertions(+), 81 deletions(-) copy source4/scripting/python/samba/netcmd/{setexpiry.py => enableaccount.py} (79%) mode change 100644 => 100755 delete mode 100755 source4/setup/enableaccount diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py index ca5a8ddf241..3213dd71b36 100644 --- a/source4/scripting/python/samba/netcmd/__init__.py +++ b/source4/scripting/python/samba/netcmd/__init__.py @@ -135,3 +135,5 @@ from samba.netcmd.setpassword import cmd_setpassword commands["setpassword"] = cmd_setpassword() from samba.netcmd.setexpiry import cmd_setexpiry commands["setexpiry"] = cmd_setexpiry() +from samba.netcmd.enableaccount import cmd_enableaccount +commands["enableaccount"] = cmd_enableaccount() diff --git a/source4/scripting/python/samba/netcmd/setexpiry.py b/source4/scripting/python/samba/netcmd/enableaccount.py old mode 100644 new mode 100755 similarity index 79% copy from source4/scripting/python/samba/netcmd/setexpiry.py copy to source4/scripting/python/samba/netcmd/enableaccount.py index 51cf4c8c1a1..d4af0a84f1f --- a/source4/scripting/python/samba/netcmd/setexpiry.py +++ b/source4/scripting/python/samba/netcmd/enableaccount.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Sets the user password expiry on a Samba4 server +# Enables an user account on a Samba4 server # Copyright Jelmer Vernooij 2008 # # Based on the original in EJS: @@ -20,16 +20,16 @@ # along with this program. If not, see . # -from samba.netcmd import Command, CommandError, Option - import samba.getopt as options from samba.auth import system_session +from samba.netcmd import Command, CommandError, Option from samba.samdb import SamDB -class cmd_setexpiry(Command): +class cmd_enableaccount(Command): + """Enable an account.""" - synopsis = "setexpiry [username] [options]" + synopsis = "enableaccount [username] [options]" takes_optiongroups = { "sambaopts": options.SambaOptions, @@ -40,14 +40,12 @@ class cmd_setexpiry(Command): takes_options = [ Option("-H", help="LDB URL for database or target server", type=str), Option("--filter", help="LDAP Filter to set password on", type=str), - Option("--days", help="Days to expiry", type=int), - Option("--noexpiry", help="Password does never expire", action="store_true"), - ] + ] takes_args = ["username?"] def run(self, username=None, sambaopts=None, credopts=None, - versionopts=None, H=None, filter=None, days=None, noexpiry=None): + versionopts=None, filter=None, H=None): if username is None and filter is None: raise CommandError("Either the username or '--filter' must be specified!") @@ -57,9 +55,6 @@ class cmd_setexpiry(Command): lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp) - if days is None: - days = 0 - if H is not None: url = H else: @@ -67,5 +62,4 @@ class cmd_setexpiry(Command): samdb = SamDB(url=url, session_info=system_session(), credentials=creds, lp=lp) - - samdb.setexpiry(filter, days*24*3600, no_expiry_req=noexpiry) + samdb.enable_account(filter) diff --git a/source4/scripting/python/samba/netcmd/setexpiry.py b/source4/scripting/python/samba/netcmd/setexpiry.py index 51cf4c8c1a1..0c5dc5afff9 100644 --- a/source4/scripting/python/samba/netcmd/setexpiry.py +++ b/source4/scripting/python/samba/netcmd/setexpiry.py @@ -28,6 +28,7 @@ from samba.auth import system_session from samba.samdb import SamDB class cmd_setexpiry(Command): + """Set the expiration of a user account.""" synopsis = "setexpiry [username] [options]" diff --git a/source4/setup/enableaccount b/source4/setup/enableaccount deleted file mode 100755 index f8f727c1ee2..00000000000 --- a/source4/setup/enableaccount +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/python -# -# Enables an user account on 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 . -# - -import sys - -sys.path.insert(0, "bin/python") - -import samba.getopt as options -import optparse - -from samba.auth import system_session -from samba.samdb import SamDB - -parser = optparse.OptionParser("enableaccount [username] [options]") -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("--filter", help="LDAP Filter to set password on", type=str) - -opts, args = parser.parse_args() - -filter = opts.filter - -if (len(args) == 0) and (filter is None): - print "Either the username or '--filter' must be specified!" - parser.print_usage() - sys.exit(1) - -if filter is None: - username = args[0] - filter = "(&(objectClass=user)(sAMAccountName=%s))" % (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.enable_account(filter) diff --git a/testprogs/blackbox/test_kinit.sh b/testprogs/blackbox/test_kinit.sh index 91f21f473b4..0f835ef6354 100755 --- a/testprogs/blackbox/test_kinit.sh +++ b/testprogs/blackbox/test_kinit.sh @@ -25,7 +25,7 @@ samba4kinit="$samba4bindir/samba4kinit$EXEEXT" net="$samba4bindir/net$EXEEXT" rkpty="$samba4bindir/rkpty$EXEEXT" samba4kpasswd="$samba4bindir/samba4kpasswd$EXEEXT" -enableaccount="$PYTHON `dirname $0`/../../source4/setup/enableaccount" +enableaccount="$samba4bindir/net enableaccount" . `dirname $0`/subunit.sh diff --git a/testprogs/blackbox/test_passwords.sh b/testprogs/blackbox/test_passwords.sh index 71a0f467674..b669887fbf4 100755 --- a/testprogs/blackbox/test_passwords.sh +++ b/testprogs/blackbox/test_passwords.sh @@ -25,7 +25,6 @@ samba4kinit="$samba4bindir/samba4kinit$EXEEXT" net="$samba4bindir/net$EXEEXT" rkpty="$samba4bindir/rkpty$EXEEXT" samba4kpasswd="$samba4bindir/samba4kpasswd$EXEEXT" -enableaccount="$PYTHON `dirname $0`/../../source4/setup/enableaccount" newuser="$PYTHON `dirname $0`/../../source4/setup/newuser" . `dirname $0`/subunit.sh -- 2.11.4.GIT