samba4 / samba-tool patches, patch 0001 of 0002

[Theresa Halloran]

>From e92c35ed88134af678158f99ce9ba3370abddf33 Mon Sep 17 00:00:00 2001
From: Theresa <thallora at us.ibm.com>
Date: Tue, 17 May 2011 21:00:00 -0400
Subject: [PATCH 1/2] [samba-tool]

s4/samba-tool: move samba-tool enableaccount command to samba-tool user
---
  .../scripting/python/samba/netcmd/enableaccount.py |   27 ++++++++------
  source4/scripting/python/samba/netcmd/user.py      |   39 
++++++++++++++++++++
  source4/setup/tests/blackbox_newuser.sh            |    4 +-
  3 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/source4/scripting/python/samba/netcmd/enableaccount.py 
b/source4/scripting/python/samba/netcmd/enableaccount.py
index 3ceddb3..47dffcc 100644
--- a/source4/scripting/python/samba/netcmd/enableaccount.py
+++ b/source4/scripting/python/samba/netcmd/enableaccount.py
@@ -2,6 +2,7 @@
  #
  # Enables an user account on a Samba4 server
  # Copyright Jelmer Vernooij 2008
+# Copyright Theresa Halloran <theresahalloran at gmail.com> 2011
  #
  # Based on the original in EJS:
  # Copyright Andrew Tridgell 2005
@@ -46,15 +47,17 @@ class cmd_enableaccount(Command):

      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)
+         print "This command no longer works."
+         print "Use samba-tool user enableaccount [username?] [options]"
+#        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..336b2e2 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,9 @@
  #

  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 +30,7 @@ from samba.netcmd import (
      Command,
      CommandError,
      SuperCommand,
+    Option,
      )

  class cmd_user_add(Command):
@@ -70,6 +75,39 @@ class cmd_user_delete(Command):
          except RuntimeError, msg:
              raise CommandError("Failed to delete user %s: %s" % (name, 
msg))

+class cmd_user_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)

  class cmd_user(SuperCommand):
      """User management [server connection needed]"""
@@ -77,4 +115,5 @@ class cmd_user(SuperCommand):
      subcommands = {}
      subcommands["add"] = cmd_user_add()
      subcommands["delete"] = cmd_user_delete()
+    subcommands["enableaccount"] = cmd_user_enableaccount()

diff --git a/source4/setup/tests/blackbox_newuser.sh 
b/source4/setup/tests/blackbox_newuser.sh
index fe5d051..96d40ca 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 enableaccount $CONFIG NewUser
+testit "enableaccount" $samba_tool user enableaccount $CONFIG NewUser1

  # check the enable account script
  testit "setpassword" $samba_tool setpassword $CONFIG NewUser 
--newpassword=testp at ssw0Rd2
-- 
1.7.3.4