samba-tool: removed join as it has been replaced by domain join

This is part of the samba-tool work to fit the object-action model

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py
index 9008d9f1d5967d5de49ced17e8950235ed7b544b..e5e2d69235b49bde7241d74b23ce0e9a7aa824fa 100644 (file)
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -190,8 +190,6 @@ from samba.netcmd.spn import cmd_spn
 commands["spn"] = cmd_spn()
 from samba.netcmd.group import cmd_group
 commands["group"] = cmd_group()
-from samba.netcmd.join import cmd_join
-commands["join"] = cmd_join()
 from samba.netcmd.rodc import cmd_rodc
 commands["rodc"] = cmd_rodc()
 from samba.netcmd.drs import cmd_drs

diff --git a/source4/scripting/python/samba/netcmd/join.py b/source4/scripting/python/samba/netcmd/join.py
deleted file mode 100644 (file)
index 820709c..0000000
--- a/source4/scripting/python/samba/netcmd/join.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python
-#
-# joins
-# 
-# Copyright Jelmer Vernooij 2010
-#
-# 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.net import Net, LIBNET_JOIN_AUTOMATIC
-from samba.netcmd import Command, CommandError, Option
-from samba.dcerpc.misc import SEC_CHAN_WKSTA
-from samba.join import join_RODC, join_DC
-
-class cmd_join(Command):
-    """Joins domain as either member or backup domain controller [server connection needed]"""
-
-    synopsis = "%prog join <dnsdomain> [DC | RODC | MEMBER] [options]"
-
-    takes_optiongroups = {
-        "sambaopts": options.SambaOptions,
-        "versionopts": options.VersionOptions,
-        "credopts": options.CredentialsOptions,
-    }
-
-    takes_options = [
-        Option("--server", help="DC to join", type=str),
-        Option("--site", help="site to join", type=str),
-        Option("--targetdir", help="where to store provision", type=str),
-        ]
-
-    takes_args = ["domain", "role?"]
-
-    def run(self, domain, role=None, sambaopts=None, credopts=None,
-            versionopts=None, server=None, site=None, targetdir=None):
-        lp = sambaopts.get_loadparm()
-        creds = credopts.get_credentials(lp)
-        net = Net(creds, lp, server=credopts.ipaddress)
-
-        if site is None:
-            site = "Default-First-Site-Name"
-
-        netbios_name = lp.get("netbios name")
-
-        if not role is None:
-            role = role.upper()
-
-        if role is None or role == "MEMBER":
-            (join_password, sid, domain_name) = net.join_member(domain,
-                                                                netbios_name,
-                                                                LIBNET_JOIN_AUTOMATIC)
-
-            self.outf.write("Joined domain %s (%s)\n" % (domain_name, sid))
-            return
-
-        elif role == "DC":
-            join_DC(server=server, creds=creds, lp=lp, domain=domain,
-                    site=site, netbios_name=netbios_name, targetdir=targetdir)
-            return
-        elif role == "RODC":
-            join_RODC(server=server, creds=creds, lp=lp, domain=domain,
-                      site=site, netbios_name=netbios_name, targetdir=targetdir)
-            return
-        else:
-            raise CommandError("Invalid role %s (possible values: MEMBER, BDC, RODC)" % role)