s4-net: moved the net join command to python

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py
index 08ddcefe910adb2aa63e914880f5bfc4bcb2e9ea..331c543aabf6a8443c1c174a7194421610c6fe18 100644 (file)
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -164,3 +164,5 @@ 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()

diff --git a/source4/scripting/python/samba/netcmd/join.py b/source4/scripting/python/samba/netcmd/join.py
index 90bb0775abbe4bb43e3d41fad6f9baba31baac3b..4f04b77abfed4479bb1c820282d2853b502eeef9 100644 (file)
--- a/source4/scripting/python/samba/netcmd/join.py
+++ b/source4/scripting/python/samba/netcmd/join.py
@@ -22,7 +22,7 @@ import samba.getopt as options
 
 from samba.net import Net, LIBNET_JOIN_AUTOMATIC
 from samba.netcmd import Command, CommandError
-from samba.dcerpc.netr import SEC_CHAN_WKSTA, SEC_CHAN_BDC
+from samba.dcerpc.misc import SEC_CHAN_WKSTA, SEC_CHAN_BDC
 
 
 class cmd_join(Command):
@@ -54,6 +54,6 @@ class cmd_join(Command):
             raise CommandError("Invalid role %s (possible values: MEMBER, BDC)" % role)
 
         (join_password, sid, domain_name) = net.join(domain,
-            lp.get("netbios name"), SEC_CHAN_WKSTA, LIBNET_JOIN_AUTOMATIC)
+            lp.get("netbios name"), secure_channel_type, LIBNET_JOIN_AUTOMATIC)
 
         self.outf.write("Joined domain %s (%s)\n" % (domain_name, sid))

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 55dcca0931e45ce269cf20b214db2c372cf0e91e..acace9eeed193ee15bcf34b57b1c11dbcb338520 100644 (file)
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -197,7 +197,6 @@ int net_run_usage(struct net_context *ctx,
 /* main function table */
 static const struct net_functable net_functable[] = {
        {"password", "Changes/Sets the password on a user account [server connection needed]\n", net_password, net_password_usage},
-       {"join", "Joins a domain [server connection needed]\n", net_join, net_join_usage},
        {"samdump", "dump the sam of a domain\n", net_samdump, net_samdump_usage},
        {"samsync", "synchronise into the local ldb the sam of an NT4 domain\n", net_samsync_ldb, net_samsync_ldb_usage},
        {"drs", "Implements functionality offered by repadmin.exe utility in Windows\n", net_drs, net_drs_usage},

diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c
deleted file mode 100644 (file)
index df75ff7..0000000
--- a/source4/utils/net/net_join.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
-   Samba Unix/Linux SMB client library 
-   Distributed SMB/CIFS Server Management Utility 
-
-   Copyright (C) 2004 Stefan Metzmacher <metze@samba.org>
-   Copyright (C) 2005 Andrew Bartlett <abartlet@samba.org>
-
-   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/>.
-*/
-
-#include "includes.h"
-#include "utils/net/net.h"
-#include "libnet/libnet.h"
-#include "libcli/security/security.h"
-#include "param/param.h"
-#include "lib/events/events.h"
-
-int net_join(struct net_context *ctx, int argc, const char **argv) 
-{
-       NTSTATUS status;
-       struct libnet_context *libnetctx;
-       struct libnet_Join *r;
-       char *tmp;
-       const char *domain_name;
-       enum netr_SchannelType secure_channel_type = SEC_CHAN_WKSTA;
-
-       switch (argc) {
-               case 0: /* no args -> fail */
-                       return net_join_usage(ctx, argc, argv);
-               case 1: /* only DOMAIN */
-                       tmp = talloc_strdup(ctx, argv[0]);
-                       break;
-               case 2: /* DOMAIN and role */
-                       tmp = talloc_strdup(ctx, argv[0]);
-                       if (strcasecmp(argv[1], "BDC") == 0) {
-                               secure_channel_type = SEC_CHAN_BDC;
-                       } else if (strcasecmp(argv[1], "MEMBER") == 0) {
-                               secure_channel_type = SEC_CHAN_WKSTA;
-                       } else {
-                               d_fprintf(stderr, "net_join: Invalid 2nd argument (%s) must be MEMBER or BDC\n", argv[1]);
-                               return net_join_usage(ctx, argc, argv);
-                       }
-                       break;
-               default: /* too many args -> fail */
-                       return net_join_usage(ctx, argc, argv);
-       }
-
-       domain_name = tmp;
-
-       libnetctx = libnet_context_init(ctx->event_ctx, ctx->lp_ctx);
-       if (!libnetctx) {
-               return -1;      
-       }
-       libnetctx->cred = ctx->credentials;
-       r = talloc(ctx, struct libnet_Join);
-       if (!r) {
-               return -1;
-       }
-       /* prepare parameters for the join */
-       r->in.netbios_name              = lpcfg_netbios_name(ctx->lp_ctx);
-       r->in.domain_name               = domain_name;
-       r->in.join_type                 = secure_channel_type;
-       r->in.level                     = LIBNET_JOIN_AUTOMATIC;
-       r->out.error_string             = NULL;
-
-       /* do the domain join */
-       status = libnet_Join(libnetctx, r, r);
-       
-       if (!NT_STATUS_IS_OK(status)) {
-               d_fprintf(stderr, "Joining domain failed: %s\n",
-                         r->out.error_string ? r->out.error_string : nt_errstr(status));
-               talloc_free(r);
-               talloc_free(libnetctx);
-               return -1;
-       }
-       d_printf("Joined domain %s (%s)\n", r->out.domain_name, dom_sid_string(ctx, r->out.domain_sid));
-
-       talloc_free(libnetctx);
-       return 0;
-}
-
-int net_join_usage(struct net_context *ctx, int argc, const char **argv)
-{
-       d_printf("net join <domain> [BDC | MEMBER] [options]\n");
-       return 0;       
-}
-
-int net_join_help(struct net_context *ctx, int argc, const char **argv)
-{
-       d_printf("Joins domain as either member or backup domain controller.\n");
-       return 0;       
-}
-

diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build
index c929ce8354e08fe2270c82ec576ed53eebf71add..99d8c5593d9af57e8fb6dbc3326b8066dc634256 100644 (file)
--- a/source4/utils/net/wscript_build
+++ b/source4/utils/net/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_MODULE('net_drs',
 
 
 bld.SAMBA_BINARY('net',
-       source='net.c net_password.c net_join.c net_vampire.c net_gpo.c',
+       source='net.c net_password.c net_vampire.c net_gpo.c',
        autoproto='net_proto.h',
        deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-NET popt POPT_SAMBA POPT_CREDENTIALS net_drs policy auth',
         needs_python=True