samba-tool: Remove vampire subcommand and now unused libnet_Vampire()

This has been deprecated for a long time now

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/python/samba/netcmd/main.py b/python/samba/netcmd/main.py
index 5f78823588084bf5a331f268add36b4c9f400a69..471c6b4f4a90254e28756bd8e351742545e23875 100644 (file)
--- a/python/samba/netcmd/main.py
+++ b/python/samba/netcmd/main.py
@@ -37,7 +37,6 @@ from samba.netcmd.spn import cmd_spn
 from samba.netcmd.testparm import cmd_testparm
 from samba.netcmd.time import cmd_time
 from samba.netcmd.user import cmd_user
-from samba.netcmd.vampire import cmd_vampire
 from samba.netcmd.processes import cmd_processes
 
 
@@ -66,5 +65,4 @@ class cmd_sambatool(SuperCommand):
     subcommands["testparm"] =  cmd_testparm()
     subcommands["time"] = cmd_time()
     subcommands["user"] = cmd_user()
-    subcommands["vampire"] = cmd_vampire()
     subcommands["processes"] = cmd_processes()

diff --git a/python/samba/netcmd/vampire.py b/python/samba/netcmd/vampire.py
deleted file mode 100644 (file)
index b12222e..0000000
--- a/python/samba/netcmd/vampire.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# Vampire
-#
-# Copyright Jelmer Vernooij 2010 <jelmer@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/>.
-#
-
-import samba.getopt as options
-
-from samba.net import Net
-
-from samba.netcmd import (
-    Command,
-    Option,
-    SuperCommand,
-    CommandError
-    )
-
-
-class cmd_vampire(Command):
-    """Join and synchronise a remote AD domain to the local server."""
-    synopsis = "%prog [options] <domain>"
-
-    takes_optiongroups = {
-        "sambaopts": options.SambaOptions,
-        "credopts": options.CredentialsOptions,
-        "versionopts": options.VersionOptions,
-        }
-
-    takes_options = [
-        Option("--target-dir", help="Target directory.", type=str),
-        Option("--force", help="force run", action='store_true', default=False),
-        ]
-
-    takes_args = ["domain"]
-
-    def run(self, domain, target_dir=None, credopts=None, sambaopts=None, versionopts=None, force=False):
-        if not force:
-            raise CommandError("samba-tool vampire is deprecated, please use samba-tool domain join. Use --force to override")
-        lp = sambaopts.get_loadparm()
-        creds = credopts.get_credentials(lp)
-        net = Net(creds, lp, server=credopts.ipaddress)
-        (domain_name, domain_sid) = net.vampire(domain=domain, target_dir=target_dir)
-        self.outf.write("Vampired domain %s (%s)\n" % (domain_name, domain_sid))

diff --git a/python/samba/tests/provision.py b/python/samba/tests/provision.py
index 67f8c18cf10e5ba6a52e7606fc09f2937f1ee5cf..91c66d5234634dd4878a724cc8178885ee30e2e7 100644 (file)
--- a/python/samba/tests/provision.py
+++ b/python/samba/tests/provision.py
@@ -116,9 +116,6 @@ class Disabled(object):
     def test_join_domain(self):
         raise NotImplementedError(self.test_join_domain)
 
-    def test_vampire(self):
-        raise NotImplementedError(self.test_vampire)
-
 
 class SanitizeServerRoleTests(TestCase):
 

diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 69195af180c134ea687b04c2546c598d2076813b..1c3403fdb1cfa7a9bae4efc497b59b12232200ee 100644 (file)
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -748,285 +748,3 @@ NTSTATUS libnet_vampire_cb_store_chunk(void *private_data,
        return NT_STATUS_OK;
 }
 
-static NTSTATUS update_dnshostname_for_server(TALLOC_CTX *mem_ctx,
-                                             struct ldb_context *ldb,
-                                             const char *server_dn_str,
-                                             const char *netbios_name,
-                                             const char *realm)
-{
-       int ret;
-       struct ldb_message *msg;
-       struct ldb_message_element *el;
-       struct ldb_dn *server_dn;
-       const char *dNSHostName = strlower_talloc(mem_ctx,
-                                                 talloc_asprintf(mem_ctx,
-                                                                 "%s.%s",
-                                                                 netbios_name,
-                                                                 realm));
-       msg = ldb_msg_new(mem_ctx);
-       if (msg == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       server_dn = ldb_dn_new(mem_ctx, ldb, server_dn_str);
-       if (!server_dn) {
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       msg->dn = server_dn;
-       ret = ldb_msg_add_empty(msg, "dNSHostName", LDB_FLAG_MOD_ADD, &el);
-       if (ret != LDB_SUCCESS) {
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       ret = ldb_msg_add_steal_string(msg,
-                                      "dNSHostName",
-                                      talloc_asprintf(el->values, "%s", dNSHostName));
-       if (ret != LDB_SUCCESS) {
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       ret = dsdb_modify(ldb, msg, DSDB_MODIFY_PERMISSIVE);
-       if (ret != LDB_SUCCESS) {
-               DEBUG(0,(__location__ ": Failed to add dnsHostName to the Server object: %s\n",
-                        ldb_errstring(ldb)));
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       return NT_STATUS_OK;
-}
-
-
-NTSTATUS libnet_Vampire(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, 
-                       struct libnet_Vampire *r)
-{
-       struct libnet_JoinDomain *join;
-       struct libnet_Replicate rep;
-       NTSTATUS status;
-
-       const char *account_name;
-       const char *netbios_name;
-       
-       r->out.error_string = NULL;
-
-       join = talloc_zero(mem_ctx, struct libnet_JoinDomain);
-       if (!join) {
-               return NT_STATUS_NO_MEMORY;
-       }
-               
-       if (r->in.netbios_name != NULL) {
-               netbios_name = r->in.netbios_name;
-       } else {
-               netbios_name = talloc_reference(join, lpcfg_netbios_name(ctx->lp_ctx));
-               if (!netbios_name) {
-                       talloc_free(join);
-                       r->out.error_string = NULL;
-                       return NT_STATUS_NO_MEMORY;
-               }
-       }
-
-       account_name = talloc_asprintf(join, "%s$", netbios_name);
-       if (!account_name) {
-               talloc_free(join);
-               r->out.error_string = NULL;
-               return NT_STATUS_NO_MEMORY;
-       }
-       
-       /* Re-use the domain we are joining as the domain for the user
-        * to be authenticated with, unless they specified
-        * otherwise */
-       cli_credentials_set_domain(ctx->cred, r->in.domain_name, CRED_GUESS_ENV);
-
-       join->in.domain_name    = r->in.domain_name;
-       join->in.account_name   = account_name;
-       join->in.netbios_name   = netbios_name;
-       join->in.level          = LIBNET_JOINDOMAIN_AUTOMATIC;
-       join->in.acct_type      = ACB_WSTRUST;
-       join->in.recreate_account = false;
-       status = libnet_JoinDomain(ctx, join, join);
-       if (!NT_STATUS_IS_OK(status)) {
-               r->out.error_string = talloc_steal(mem_ctx, join->out.error_string);
-               talloc_free(join);
-               return status;
-       }
-
-       rep.in.domain_name   = join->out.domain_name;
-       rep.in.netbios_name  = netbios_name;
-       rep.in.targetdir     = r->in.targetdir;
-       rep.in.domain_sid    = join->out.domain_sid;
-       rep.in.realm         = join->out.realm;
-       rep.in.server        = dcerpc_binding_get_string_option(join->out.samr_binding,
-                                                               "host");
-       rep.in.join_password = join->out.join_password;
-       rep.in.kvno          = join->out.kvno;
-
-       status = libnet_Replicate(ctx, mem_ctx, &rep);
-
-       r->out.domain_sid   = join->out.domain_sid;
-       r->out.domain_name  = join->out.domain_name;
-       r->out.error_string = rep.out.error_string;
-
-       return status;
-}
-
-
-
-NTSTATUS libnet_Replicate(struct libnet_context *ctx, TALLOC_CTX *mem_ctx,
-                         struct libnet_Replicate *r)
-{
-       struct provision_store_self_join_settings *set_secrets;
-       struct libnet_BecomeDC b;
-       struct libnet_vampire_cb_state *s;
-       struct ldb_message *msg;
-       const char *error_string;
-       int ldb_ret;
-       uint32_t i;
-       NTSTATUS status;
-       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
-       const char *account_name;
-       const char *netbios_name;
-
-       r->out.error_string = NULL;
-
-       netbios_name = r->in.netbios_name;
-       account_name = talloc_asprintf(tmp_ctx, "%s$", netbios_name);
-       if (!account_name) {
-               talloc_free(tmp_ctx);
-               r->out.error_string = NULL;
-               return NT_STATUS_NO_MEMORY;
-       }
-       
-       /* Re-use the domain we are joining as the domain for the user
-        * to be authenticated with, unless they specified
-        * otherwise */
-       cli_credentials_set_domain(ctx->cred, r->in.domain_name, CRED_GUESS_ENV);
-
-       s = libnet_vampire_cb_state_init(mem_ctx, ctx->lp_ctx, ctx->event_ctx,
-                                        netbios_name, r->in.domain_name, r->in.realm,
-                                        r->in.targetdir);
-       if (!s) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       talloc_steal(s, tmp_ctx);
-
-       ZERO_STRUCT(b);
-
-       /* Be more robust:
-        * We now know the domain and realm for sure - if they didn't
-        * put one on the command line, use this for the rest of the
-        * join */
-       cli_credentials_set_realm(ctx->cred, r->in.realm, CRED_GUESS_ENV);
-       cli_credentials_set_domain(ctx->cred, r->in.domain_name, CRED_GUESS_ENV);
-
-       /* Now set these values into the smb.conf - we probably had
-        * empty or useless defaults here from whatever smb.conf we
-        * started with */
-       lpcfg_set_cmdline(s->lp_ctx, "realm", r->in.realm);
-       lpcfg_set_cmdline(s->lp_ctx, "workgroup", r->in.domain_name);
-
-       b.in.domain_dns_name            = r->in.realm;
-       b.in.domain_netbios_name        = r->in.domain_name;
-       b.in.domain_sid                 = r->in.domain_sid;
-       b.in.source_dsa_address         = r->in.server;
-       b.in.dest_dsa_netbios_name      = netbios_name;
-
-       b.in.callbacks.private_data     = s;
-       b.in.callbacks.check_options    = libnet_vampire_cb_check_options;
-       b.in.callbacks.prepare_db       = libnet_vampire_cb_prepare_db;
-       b.in.callbacks.schema_chunk     = libnet_vampire_cb_schema_chunk;
-       b.in.callbacks.config_chunk     = libnet_vampire_cb_store_chunk;
-       b.in.callbacks.domain_chunk     = libnet_vampire_cb_store_chunk;
-
-       b.in.rodc_join = lpcfg_parm_bool(s->lp_ctx, NULL, "repl", "RODC", false);
-
-       status = libnet_BecomeDC(ctx, s, &b);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("libnet_BecomeDC() failed - %s\n", nt_errstr(status));
-               talloc_free(s);
-               return status;
-       }
-
-       msg = ldb_msg_new(s);
-       if (!msg) {
-               printf("ldb_msg_new() failed\n");
-               talloc_free(s);
-               return NT_STATUS_NO_MEMORY;
-       }
-       msg->dn = ldb_dn_new(msg, s->ldb, "@ROOTDSE");
-       if (!msg->dn) {
-               printf("ldb_msg_new(@ROOTDSE) failed\n");
-               talloc_free(s);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       ldb_ret = ldb_msg_add_string(msg, "isSynchronized", "TRUE");
-       if (ldb_ret != LDB_SUCCESS) {
-               printf("ldb_msg_add_string(msg, isSynchronized, TRUE) failed: %d\n", ldb_ret);
-               talloc_free(s);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       for (i=0; i < msg->num_elements; i++) {
-               msg->elements[i].flags = LDB_FLAG_MOD_REPLACE;
-       }
-
-       printf("mark ROOTDSE with isSynchronized=TRUE\n");
-       ldb_ret = ldb_modify(s->ldb, msg);
-       if (ldb_ret != LDB_SUCCESS) {
-               printf("ldb_modify() failed: %d : %s\n", ldb_ret, ldb_errstring(s->ldb));
-               talloc_free(s);
-               return NT_STATUS_INTERNAL_DB_ERROR;
-       }
-       /* during dcpromo the 2nd computer adds dNSHostName attribute to his Server object
-        * the attribute appears on the original DC after replication
-        */
-       status = update_dnshostname_for_server(s, s->ldb, s->server_dn_str, s->netbios_name, s->realm);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Failed to update dNSHostName on Server object - %s\n", nt_errstr(status));
-               talloc_free(s);
-               return status;
-       }
-       /* prepare the transaction - this prepares to commit all the changes in
-          the ldb from the whole vampire.  Note that this 
-          triggers the writing of the linked attribute backlinks.
-       */
-       if (ldb_transaction_prepare_commit(s->ldb) != LDB_SUCCESS) {
-               printf("Failed to prepare_commit vampire transaction: %s\n", ldb_errstring(s->ldb));
-               return NT_STATUS_INTERNAL_DB_ERROR;
-       }
-
-       set_secrets = talloc(s, struct provision_store_self_join_settings);
-       if (!set_secrets) {
-               r->out.error_string = NULL;
-               talloc_free(s);
-               return NT_STATUS_NO_MEMORY;
-       }
-       
-       ZERO_STRUCTP(set_secrets);
-       set_secrets->domain_name = r->in.domain_name;
-       set_secrets->realm = r->in.realm;
-       set_secrets->netbios_name = netbios_name;
-       set_secrets->secure_channel_type = SEC_CHAN_BDC;
-       set_secrets->machine_password = r->in.join_password;
-       set_secrets->key_version_number = r->in.kvno;
-       set_secrets->domain_sid = r->in.domain_sid;
-       
-       status = provision_store_self_join(ctx, s->lp_ctx, ctx->event_ctx, set_secrets, &error_string);
-       if (!NT_STATUS_IS_OK(status)) {
-               r->out.error_string = talloc_steal(mem_ctx, error_string);
-               talloc_free(s);
-               return status;
-       }
-
-       /* commit the transaction now we know the secrets were written
-        * out properly
-       */
-       if (ldb_transaction_commit(s->ldb) != LDB_SUCCESS) {
-               printf("Failed to commit vampire transaction\n");
-               return NT_STATUS_INTERNAL_DB_ERROR;
-       }
-
-       talloc_free(s);
-
-       return NT_STATUS_OK;
-}

diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index 3fcbf05c34813471f03b94ec1469a7ae4274d211..48009b2be533c52a5ec2b72d54e1bfd6c872b1e1 100644 (file)
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -293,61 +293,6 @@ static PyObject *py_net_user_delete(py_net_Object *self, PyObject *args, PyObjec
 static const char py_net_delete_user_doc[] = "delete_user(username)\n"
 "Delete a user.";
 
-static PyObject *py_dom_sid_FromSid(struct dom_sid *sid)
-{
-       PyObject *mod_security, *dom_sid_Type;
-
-       mod_security = PyImport_ImportModule("samba.dcerpc.security");
-       if (mod_security == NULL)
-               return NULL;
-
-       dom_sid_Type = PyObject_GetAttrString(mod_security, "dom_sid");
-       if (dom_sid_Type == NULL)
-               return NULL;
-
-       return pytalloc_reference((PyTypeObject *)dom_sid_Type, sid);
-}
-
-static PyObject *py_net_vampire(py_net_Object *self, PyObject *args, PyObject *kwargs)
-{
-       const char *kwnames[] = { "domain", "target_dir", NULL };
-       NTSTATUS status;
-       TALLOC_CTX *mem_ctx;
-       PyObject *ret;
-       struct libnet_Vampire r;
-
-       ZERO_STRUCT(r);
-
-       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|z", discard_const_p(char *, kwnames),
-                                        &r.in.domain_name, &r.in.targetdir)) {
-               return NULL;
-       }
-
-       r.in.netbios_name  = lpcfg_netbios_name(self->libnet_ctx->lp_ctx);
-       r.out.error_string = NULL;
-
-       mem_ctx = talloc_new(NULL);
-       if (mem_ctx == NULL) {
-               PyErr_NoMemory();
-               return NULL;
-       }
-
-       status = libnet_Vampire(self->libnet_ctx, mem_ctx, &r);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               PyErr_SetString(PyExc_RuntimeError,
-                               r.out.error_string ? r.out.error_string : nt_errstr(status));
-               talloc_free(mem_ctx);
-               return NULL;
-       }
-
-       ret = Py_BuildValue("(sO)", r.out.domain_name, py_dom_sid_FromSid(r.out.domain_sid));
-
-       talloc_free(mem_ctx);
-
-       return ret;
-}
-
 struct replicate_state {
        void *vampire_state;
        dcerpc_InterfaceObject *drs_pipe;
@@ -593,9 +538,6 @@ static PyObject *py_net_finddc(py_net_Object *self, PyObject *args, PyObject *kw
 }
 
 
-static const char py_net_vampire_doc[] = "vampire(domain, target_dir=None)\n"
-                                        "Vampire a domain.";
-
 static const char py_net_replicate_init_doc[] = "replicate_init(samdb, lp, drspipe)\n"
                                         "Setup for replicate_chunk calls.";
 
@@ -612,7 +554,6 @@ static PyMethodDef net_obj_methods[] = {
        {"time", (PyCFunction)py_net_time, METH_VARARGS|METH_KEYWORDS, py_net_time_doc},
        {"create_user", (PyCFunction)py_net_user_create, METH_VARARGS|METH_KEYWORDS, py_net_create_user_doc},
        {"delete_user", (PyCFunction)py_net_user_delete, METH_VARARGS|METH_KEYWORDS, py_net_delete_user_doc},
-       {"vampire", (PyCFunction)py_net_vampire, METH_VARARGS|METH_KEYWORDS, py_net_vampire_doc},
        {"replicate_init", (PyCFunction)py_net_replicate_init, METH_VARARGS|METH_KEYWORDS, py_net_replicate_init_doc},
        {"replicate_chunk", (PyCFunction)py_net_replicate_chunk, METH_VARARGS|METH_KEYWORDS, py_net_replicate_chunk_doc},
        {"finddc", (PyCFunction)py_net_finddc, METH_KEYWORDS, py_net_finddc_doc},