samba4 / samba-tool patches - rework, patch 0001 of 0002
Theresa Halloran
thallora at linux.vnet.ibm.com
Thu May 19 14:35:15 MDT 2011
From 74e80f932535a47a268d0b6d6ae67886c38d75af Mon Sep 17 00:00:00 2001
From: Theresa Halloran <theresahalloran at gmail.com>
Date: Thu, 19 May 2011 16:17:07 -0400
Subject: [PATCH 1/2] s4/samba-tool: Move samba-tool enableaccount to
samba-tool user enable command.
---
source4/scripting/python/samba/netcmd/__init__.py | 3 +-
.../scripting/python/samba/netcmd/enableaccount.py | 60
--------------------
source4/scripting/python/samba/netcmd/user.py | 42 ++++++++++++++
source4/setup/tests/blackbox_newuser.sh | 4 +-
4 files changed, 45 insertions(+), 64 deletions(-)
delete mode 100644 source4/scripting/python/samba/netcmd/enableaccount.py
diff --git a/source4/scripting/python/samba/netcmd/__init__.py
b/source4/scripting/python/samba/netcmd/__init__.py
index cf514d5..ee2e700 100644
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -2,6 +2,7 @@
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2009
+# Copyright (C) Theresa Halloran <theresahalloran at gmail.com> 2011
#
# 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
@@ -181,8 +182,6 @@ 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()
from samba.netcmd.newuser import cmd_newuser
commands["newuser"] = cmd_newuser()
from samba.netcmd.netacl import cmd_acl
diff --git a/source4/scripting/python/samba/netcmd/enableaccount.py
b/source4/scripting/python/samba/netcmd/enableaccount.py
deleted file mode 100644
index 3ceddb3..0000000
--- a/source4/scripting/python/samba/netcmd/enableaccount.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env 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 <http://www.gnu.org/licenses/>.
-#
-
-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_enableaccount(Command):
- """Enables a user"""
-
- synopsis = "enableaccount [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),
- ]
-
- takes_args = ["username?"]
-
- def run(self, username=None, sambaopts=None, credopts=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!")
-
- if filter is None:
- filter = "(&(objectClass=user)(sAMAccountName=%s))" %
(username)
-
- lp = sambaopts.get_loadparm()
- creds = credopts.get_credentials(lp, fallback_machine=True)
-
- samdb = SamDB(url=H, session_info=system_session(),
- credentials=creds, lp=lp)
- samdb.enable_account(filter)
diff --git a/source4/scripting/python/samba/netcmd/user.py
b/source4/scripting/python/samba/netcmd/user.py
index a5750b5..5f53263 100644
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/source4/scripting/python/samba/netcmd/user.py
@@ -3,6 +3,7 @@
# user management
#
# Copyright Jelmer Vernooij 2010 <jelmer at samba.org>
+# Copyright Theresa Halloran 2011 <theresahalloran at gmail.com>
#
# 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
@@ -19,6 +20,10 @@
#
import samba.getopt as options
+import sys
+from samba.auth import system_session
+from samba.samdb import SamDB
+
from samba.net import Net
@@ -26,6 +31,7 @@ from samba.netcmd import (
Command,
CommandError,
SuperCommand,
+ Option,
)
class cmd_user_add(Command):
@@ -70,6 +76,41 @@ class cmd_user_delete(Command):
except RuntimeError, msg:
raise CommandError("Failed to delete user %s: %s" % (name,
msg))
+class cmd_user_enable(Command):
+ """Enables a user"""
+
+ synopsis = "%prog user enable <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),
+ ]
+
+ takes_args = ["username?"]
+
+ def run(self, username=None, sambaopts=None, credopts=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!")
+
+ if filter is None:
+ filter = "(&(objectClass=user)(sAMAccountName=%s))" %
(username)
+
+ lp = sambaopts.get_loadparm()
+ creds = credopts.get_credentials(lp, fallback_machine=True)
+
+ samdb = SamDB(url=H, session_info=system_session(),
+ credentials=creds, lp=lp)
+ samdb.enable_account(filter)
+
+
class cmd_user(SuperCommand):
"""User management [server connection needed]"""
@@ -77,4 +118,5 @@ class cmd_user(SuperCommand):
subcommands = {}
subcommands["add"] = cmd_user_add()
subcommands["delete"] = cmd_user_delete()
+ subcommands["enable"] = cmd_user_enable()
diff --git a/source4/setup/tests/blackbox_newuser.sh
b/source4/setup/tests/blackbox_newuser.sh
index fe5d051..71c957b 100755
--- a/source4/setup/tests/blackbox_newuser.sh
+++ b/source4/setup/tests/blackbox_newuser.sh
@@ -26,8 +26,8 @@ testit "newuser" $samba_tool newuser $CONFIG
--given-name="User" --surname="Test
testit "newuser" $samba_tool newuser $CONFIG --use-username-as-cn
--given-name="User1" --surname="Tester1" --initials="UT1"
--profile-path="\\\\myserver\\my\\profile"
--script-path="\\\\myserver\\my\\script"
--home-directory="\\\\myserver\\my\\homedir" --job-title="Tester"
--department="Testing" --company="Samba.org" --description="Description"
--mail-address="tester at samba.org" --internet-address="http://samba.org"
--telephone-number="001122334455" --physical-delivery-office="101"
--home-drive="H:" NewUser1 testp at ssw0Rd
# check the enable account script
-testit "enableaccount" $samba_tool enableaccount $CONFIG NewUser
-testit "enableaccount" $samba_tool enableaccount $CONFIG NewUser1
+testit "enableaccount" $samba_tool user enable $CONFIG NewUser
+testit "enableaccount" $samba_tool user enable $CONFIG NewUser1
# check the enable account script
testit "setpassword" $samba_tool setpassword $CONFIG NewUser
--newpassword=testp at ssw0Rd2
--
1.7.3.4
More information about the samba-technical
mailing list