Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

	source/Makefile
	source/auth/config.mk
	source/auth/gensec/config.mk
	source/build/m4/public.m4
	source/build/make/python.mk
	source/build/make/rules.mk
	source/build/smb_build/header.pm
	source/build/smb_build/main.pl
	source/build/smb_build/makefile.pm
	source/dsdb/config.mk
	source/dsdb/samdb/ldb_modules/config.mk
	source/kdc/config.mk
	source/lib/events/config.mk
	source/lib/events/events.c
	source/lib/ldb/config.mk
	source/lib/nss_wrapper/config.mk
	source/lib/policy/config.mk
	source/lib/util/config.mk
	source/libcli/smb2/config.mk
	source/libnet/config.mk
	source/librpc/config.mk
	source/nbt_server/config.mk
	source/ntptr/ntptr_base.c
	source/ntvfs/posix/config.mk
	source/ntvfs/sysdep/config.mk
	source/param/config.mk
	source/rpc_server/config.mk
	source/rpc_server/service_rpc.c
	source/scripting/ejs/config.mk
	source/scripting/python/config.mk
	source/smb_server/config.mk
	source/smbd/server.c
	source/torture/config.mk
	source/torture/smb2/config.mk
	source/wrepl_server/config.mk
(This used to be commit 13bbd420681519894a4036729c43273912c9b402)

1 files changed, 73 insertions, 5 deletions

diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c
index 08a4fbd4a1..ad63340089 100644
--- a/source4/utils/net/net_join.c
+++ b/source4/utils/net/net_join.c
@@ -24,6 +24,7 @@
 #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) 
 {
@@ -38,10 +39,10 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
 		case 0: /* no args -> fail */
 			return net_join_usage(ctx, argc, argv);
 		case 1: /* only DOMAIN */
-			tmp = talloc_strdup(ctx->mem_ctx, argv[0]);
+			tmp = talloc_strdup(ctx, argv[0]);
 			break;
 		case 2: /* DOMAIN and role */
-			tmp = talloc_strdup(ctx->mem_ctx, argv[0]);
+			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) {
@@ -57,12 +58,12 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
 
 	domain_name = tmp;
 
-	libnetctx = libnet_context_init(NULL, ctx->lp_ctx);
+	libnetctx = libnet_context_init(ctx->event_ctx, ctx->lp_ctx);
 	if (!libnetctx) {
 		return -1;	
 	}
 	libnetctx->cred = ctx->credentials;
-	r = talloc(ctx->mem_ctx, struct libnet_Join);
+	r = talloc(ctx, struct libnet_Join);
 	if (!r) {
 		return -1;
 	}
@@ -83,7 +84,7 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
 		talloc_free(libnetctx);
 		return -1;
 	}
-	d_printf("Joined domain %s (%s)\n", r->out.domain_name, dom_sid_string(ctx->mem_ctx, r->out.domain_sid));
+	d_printf("Joined domain %s (%s)\n", r->out.domain_name, dom_sid_string(ctx, r->out.domain_sid));
 
 	talloc_free(libnetctx);
 	return 0;
@@ -100,3 +101,70 @@ 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;	
 }
+
+int net_vampire(struct net_context *ctx, int argc, const char **argv) 
+{
+	NTSTATUS status;
+	struct libnet_context *libnetctx;
+	struct libnet_Vampire *r;
+	char *tmp, *targetdir = NULL;
+	const char *domain_name;
+
+	switch (argc) {
+		case 0: /* no args -> fail */
+			return net_vampire_usage(ctx, argc, argv);
+		case 1: /* only DOMAIN */
+			tmp = talloc_strdup(ctx, argv[0]);
+			break;
+		case 2: /* domain and target dir */
+			tmp = talloc_strdup(ctx, argv[0]);
+			targetdir = talloc_strdup(ctx, argv[1]);
+			break;
+		default: /* too many args -> fail */
+			return net_vampire_usage(ctx, argc, argv);
+	}
+
+	domain_name = tmp;
+
+	libnetctx = libnet_context_init(NULL, ctx->lp_ctx);
+	if (!libnetctx) {
+		return -1;	
+	}
+	libnetctx->cred = ctx->credentials;
+	r = talloc(ctx, struct libnet_Vampire);
+	if (!r) {
+		return -1;
+	}
+	/* prepare parameters for the vampire */
+	r->in.netbios_name  = lp_netbios_name(ctx->lp_ctx);
+	r->in.domain_name   = domain_name;
+	r->in.targetdir	    = targetdir;
+	r->out.error_string = NULL;
+
+	/* do the domain vampire */
+	status = libnet_Vampire(libnetctx, r, r);
+	
+	if (!NT_STATUS_IS_OK(status)) {
+		d_fprintf(stderr, "Vampire of 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("Vampired domain %s (%s)\n", r->out.domain_name, dom_sid_string(ctx, r->out.domain_sid));
+
+	talloc_free(libnetctx);
+	return 0;
+}
+
+int net_vampire_usage(struct net_context *ctx, int argc, const char **argv)
+{
+	d_printf("net vampire <domain> [options]\n");
+	return 0;	
+}
+
+int net_vampire_help(struct net_context *ctx, int argc, const char **argv)
+{
+	d_printf("Vampires domain as either member or backup domain controller.\n");
+	return 0;	
+}