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, 13 insertions, 57 deletions

diff --git a/source4/libnet/libnet_vampire.h b/source4/libnet/libnet_vampire.h
index d2ac30fe14..5e0c7594b2 100644
--- a/source4/libnet/libnet_vampire.h
+++ b/source4/libnet/libnet_vampire.h
@@ -1,7 +1,9 @@
 /* 
    Unix SMB/CIFS implementation.
-
+   
+   Copyright (C) Stefan Metzmacher	2004
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
+   Copyright (C) Brad Henry 2005
    
    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
@@ -17,68 +19,22 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "librpc/gen_ndr/netlogon.h"
-
-struct libnet_SamSync_state {
-	struct libnet_context *machine_net_ctx;
-	struct dcerpc_pipe *netlogon_pipe;
-	const char *domain_name;
-	const struct dom_sid *domain_sid;
-	const char *realm;
-	struct GUID *domain_guid;
-};
-
-/* struct and enum for doing a remote domain vampire dump */
-struct libnet_SamSync {
-	struct {
-		const char *binding_string;
-		bool rid_crypt;
-		NTSTATUS (*init_fn)(TALLOC_CTX *mem_ctx, 		
-				    void *private,
-				    struct libnet_SamSync_state *samsync_state,
-				    char **error_string);
-		NTSTATUS (*delta_fn)(TALLOC_CTX *mem_ctx, 		
-				     void *private, 			
-				     enum netr_SamDatabaseID database,
-				     struct netr_DELTA_ENUM *delta,
-				     char **error_string);
-		void *fn_ctx;
-		struct cli_credentials *machine_account;
-	} in;
-	struct {
-		const char *error_string;
-	} out;
-};
-
-struct libnet_SamDump {
-	struct {
-		const char *binding_string;
-		struct cli_credentials *machine_account;
-	} in;
-	struct {
-		const char *error_string;
-	} out;
-};
+#ifndef __LIBNET_VAMPIRE_H__
+#define __LIBNET_VAMPIRE_H__
 
-struct libnet_SamDump_keytab {
+struct libnet_Vampire {
 	struct {
-		const char *binding_string;
-		const char *keytab_name;
-		struct cli_credentials *machine_account;
+		const char *domain_name;
+		const char *netbios_name;
+		const char *targetdir;
 	} in;
+	
 	struct {
+		struct dom_sid *domain_sid;
+		const char *domain_name;
 		const char *error_string;
 	} out;
 };
 
-struct libnet_samsync_ldb {
-	struct {
-		const char *binding_string;
-		struct cli_credentials *machine_account;
-		struct auth_session_info *session_info;
-	} in;
-	struct {
-		const char *error_string;
-	} out;
-};
 
+#endif /* __LIBNET_VAMPIRE_H__ */