r12865: Upgrade the librpc and libnet code.

In librpc, always try SMB level authentication, even if trying
schannel, but allow fallback to anonymous.  This should better
function with servers that set restrict anonymous.

There are too many parts of Samba that get, parse and modify the
binding parameters.  Avoid the extra work, and add a binding element
to the struct dcerpc_pipe

The libnet vampire code has been refactored, to reduce extra layers
and to better conform with the standard argument pattern.  Also, take
advantage of the new libnet_Lookup code, so we don't require the silly
'password server' smb.conf parameter.

To better support forcing traffic to be sealed for the vampire
operation, the dcerpc_bind_auth() function now takes an auth level
parameter.

Andrew Bartlett
(This used to be commit d65b354959842326fdd4bd7eb7fbeea0390f4afa)

1 files changed, 36 insertions, 26 deletions

diff --git a/source4/libnet/libnet_vampire.h b/source4/libnet/libnet_vampire.h
index ed1b3ea8280..4bbdf2733a9 100644
--- a/source4/libnet/libnet_vampire.h
+++ b/source4/libnet/libnet_vampire.h
@@ -22,40 +22,50 @@
 
 /* struct and enum for doing a remote domain vampire dump */
 struct libnet_SamSync {
-	NTSTATUS (*delta_fn)(TALLOC_CTX *mem_ctx, 		
-			     void *private, 			
-			     struct creds_CredentialState *creds,
-			     enum netr_SamDatabaseID database,
-			     struct netr_DELTA_ENUM *delta,
-			     char **error_string);
-	void *fn_ctx;
-	const char *error_string;
-	struct cli_credentials *machine_account;
-};
-
-enum libnet_SamDump_level {
-	LIBNET_SAMDUMP_GENERIC,
-	LIBNET_SAMDUMP_NETLOGON,
+	struct {
+		const char *binding_string;
+		NTSTATUS (*delta_fn)(TALLOC_CTX *mem_ctx, 		
+				     void *private, 			
+				     struct creds_CredentialState *creds,
+				     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 {
-	enum libnet_SamDump_level level;
-	const char *error_string;
+	struct {
+		const char *binding_string;
+		struct cli_credentials *machine_account;
+	} in;
+	struct {
+		const char *error_string;
+	} out;
 };
 
 struct libnet_SamDump_keytab {
-	enum libnet_SamDump_level level;
-	const char *keytab_name;
-	const char *error_string;
-};
-
-enum libnet_samsync_ldb_level {
-	LIBNET_SAMSYNC_LDB_GENERIC,
-	LIBNET_SAMSYNC_LDB_NETLOGON,
+	struct {
+		const char *binding_string;
+		const char *keytab_name;
+		struct cli_credentials *machine_account;
+	} in;
+	struct {
+		const char *error_string;
+	} out;
 };
 
 struct libnet_samsync_ldb {
-	enum libnet_samsync_ldb_level level;
-	const char *error_string;
+	struct {
+		const char *binding_string;
+		struct cli_credentials *machine_account;
+	} in;
+	struct {
+		const char *error_string;
+	} out;
 };