1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00

s4:samba-tool: Move samba-tool setexpiry to samba-tool user setexpiry <user>

Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Theresa Halloran 2011-05-19 16:24:00 -04:00 committed by Andrew Tridgell
parent 726ee12bb4
commit 23177b5f44
4 changed files with 41 additions and 74 deletions

View File

@ -180,8 +180,6 @@ from samba.netcmd.domainlevel import cmd_domainlevel
commands["domainlevel"] = cmd_domainlevel()
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.newuser import cmd_newuser
commands["newuser"] = cmd_newuser()
from samba.netcmd.netacl import cmd_acl

View File

@ -1,67 +0,0 @@
#!/usr/bin/env python
#
# Sets the user password expiry 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 <http://www.gnu.org/licenses/>.
#
from samba.netcmd import Command, CommandError, Option
import samba.getopt as options
from samba.auth import system_session
from samba.samdb import SamDB
class cmd_setexpiry(Command):
"""Sets the expiration of a user account"""
synopsis = "setexpiry [username] [options]"
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("--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):
if username is None and filter is None:
raise CommandError("Either the username or '--filter' must be specified!")
if filter is None:
filter = "(&(objectClass=user)(sAMAccountName=%s))" % (username)
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp)
if days is None:
days = 0
samdb = SamDB(url=H, session_info=system_session(),
credentials=creds, lp=lp)
samdb.setexpiry(filter, days*24*3600, no_expiry_req=noexpiry)

View File

@ -110,7 +110,43 @@ class cmd_user_enable(Command):
credentials=creds, lp=lp)
samdb.enable_account(filter)
class cmd_user_setexpiry(Command):
"""Sets the expiration of a user account"""
synopsis = "%prog user setexpiry <username> [options]"
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("--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):
if username is None and filter is None:
raise CommandError("Either the username or '--filter' must be specified!")
if filter is None:
filter = "(&(objectClass=user)(sAMAccountName=%s))" % (username)
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp)
if days is None:
days = 0
samdb = SamDB(url=H, session_info=system_session(),
credentials=creds, lp=lp)
samdb.setexpiry(filter, days*24*3600, no_expiry_req=noexpiry)
class cmd_user(SuperCommand):
"""User management [server connection needed]"""
@ -119,4 +155,4 @@ class cmd_user(SuperCommand):
subcommands["add"] = cmd_user_add()
subcommands["delete"] = cmd_user_delete()
subcommands["enable"] = cmd_user_enable()
subcommands["setexpiry"] = cmd_user_setexpiry()

View File

@ -34,9 +34,9 @@ testit "setpassword" $samba_tool setpassword $CONFIG NewUser --newpassword=testp
testit "setpassword" $samba_tool setpassword $CONFIG NewUser1 --newpassword=testp@ssw0Rd2
# check the setexpiry script
testit "noexpiry" $samba_tool setexpiry $CONFIG NewUser --noexpiry
testit "noexpiry" $samba_tool setexpiry $CONFIG NewUser1 --noexpiry
testit "expiry" $samba_tool setexpiry $CONFIG NewUser --days=7
testit "expiry" $samba_tool setexpiry $CONFIG NewUser1 --days=7
testit "noexpiry" $samba_tool user setexpiry $CONFIG NewUser --noexpiry
testit "noexpiry" $samba_tool user setexpiry $CONFIG NewUser1 --noexpiry
testit "expiry" $samba_tool user setexpiry $CONFIG NewUser --days=7
testit "expiry" $samba_tool user setexpiry $CONFIG NewUser1 --days=7
exit $failed