net: Remove NT4-based rpc vampire ldif

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 85fe868e0760eefd826c077658542ab2eee1d2ff..293685c18d41c5aaa1b5b7fc7e4bcbddc21fce11 100644 (file)
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -319,7 +319,6 @@ struct rpc_sh_cmd *net_rpc_rights_cmds(struct net_context *c, TALLOC_CTX *mem_ct
 
 int rpc_vampire_usage(struct net_context *c, int argc, const char **argv);
 int rpc_vampire_passdb(struct net_context *c, int argc, const char **argv);
-int rpc_vampire_ldif(struct net_context *c, int argc, const char **argv);
 int rpc_vampire_keytab(struct net_context *c, int argc, const char **argv);
 
 /* The following definitions come from utils/net_rpc_service.c  */

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 51517e6f185f7eaea76f8120b0a60cb25e24a1a5..8a989d790f29b9620e7040a82784792475e5b84f 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -7442,15 +7442,6 @@ bool net_rpc_check(struct net_context *c, unsigned flags)
 static int rpc_vampire(struct net_context *c, int argc, const char **argv)
 {
        struct functable func[] = {
-               {
-                       "ldif",
-                       rpc_vampire_ldif,
-                       NET_TRANSPORT_RPC,
-                       N_("Dump remote SAM database to ldif"),
-                       N_("net rpc vampire ldif\n"
-                          "    Dump remote SAM database to LDIF file or "
-                          "stdout")
-               },
                {
                        "keytab",
                        rpc_vampire_keytab,

diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 9b9d97041c3d57d8e878d584feece4f4c31a0f66..7cfd0abfde7f29af64cc80200d8528c1f6a9dfad 100644 (file)
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -230,91 +230,6 @@ int rpc_vampire_passdb(struct net_context *c, int argc, const char **argv)
        return ret;
 }
 
-static NTSTATUS rpc_vampire_ldif_internals(struct net_context *c,
-                                          const struct dom_sid *domain_sid,
-                                          const char *domain_name,
-                                          struct cli_state *cli,
-                                          struct rpc_pipe_client *pipe_hnd,
-                                          TALLOC_CTX *mem_ctx,
-                                          int argc,
-                                          const char **argv)
-{
-       NTSTATUS status;
-       struct samsync_context *ctx = NULL;
-
-       status = libnet_samsync_init_context(mem_ctx,
-                                            domain_sid,
-                                            &ctx);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-
-       if (argc >= 1) {
-               ctx->output_filename = argv[0];
-       }
-       if (argc >= 2) {
-               parse_samsync_partial_replication_objects(ctx, argc-1, argv+1,
-                                                         &ctx->single_object_replication,
-                                                         &ctx->objects,
-                                                         &ctx->num_objects);
-       }
-
-       ctx->mode               = NET_SAMSYNC_MODE_FETCH_LDIF;
-       ctx->cli                = pipe_hnd;
-       ctx->ops                = &libnet_samsync_ldif_ops;
-       ctx->domain_name        = domain_name;
-
-       ctx->force_full_replication = c->opt_force_full_repl ? true : false;
-       ctx->clean_old_entries = c->opt_clean_old_entries ? true : false;
-
-       /* fetch domain */
-       status = libnet_samsync(SAM_DATABASE_DOMAIN, ctx);
-
-       if (!NT_STATUS_IS_OK(status) && ctx->error_message) {
-               d_fprintf(stderr, "%s\n", ctx->error_message);
-               goto fail;
-       }
-
-       if (ctx->result_message) {
-               d_fprintf(stdout, "%s\n", ctx->result_message);
-       }
-
-       /* fetch builtin */
-       ctx->domain_sid = dom_sid_dup(mem_ctx, &global_sid_Builtin);
-       ctx->domain_sid_str = sid_string_talloc(mem_ctx, ctx->domain_sid);
-       status = libnet_samsync(SAM_DATABASE_BUILTIN, ctx);
-
-       if (!NT_STATUS_IS_OK(status) && ctx->error_message) {
-               d_fprintf(stderr, "%s\n", ctx->error_message);
-               goto fail;
-       }
-
-       if (ctx->result_message) {
-               d_fprintf(stdout, "%s\n", ctx->result_message);
-       }
-
- fail:
-       TALLOC_FREE(ctx);
-       return status;
-}
-
-int rpc_vampire_ldif(struct net_context *c, int argc, const char **argv)
-{
-       if (c->display_usage) {
-               d_printf(  "%s\n"
-                          "net rpc vampire ldif\n"
-                          "    %s\n",
-                        _("Usage:"),
-                        _("Dump remote SAM database to LDIF file or "
-                          "stdout"));
-               return 0;
-       }
-
-       return run_rpc_command(c, NULL, &ndr_table_netlogon, 0,
-                              rpc_vampire_ldif_internals, argc, argv);
-}
-
-
 static NTSTATUS rpc_vampire_keytab_internals(struct net_context *c,
                                             const struct dom_sid *domain_sid,
                                             const char *domain_name,