From: Günther Deschner <gd@samba.org>
Date: Thu, 27 Mar 2008 12:03:12 +0000 (+0100)
Subject: Fix samlogon rpc client & server.
X-Git-Tag: samba-3.3.0pre1~3077
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0aaf975560dce3b4e58ab71687c3412c0c2a72cf;p=thirdparty%2Fsamba.git

Fix samlogon rpc client & server.

Guenther
---

diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index 4cd55dc5aac..ec16186462b 100644
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/rpc_client/cli_netlogon.c
@@ -226,7 +226,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	struct netr_Authenticator clnt_creds;
 	struct netr_Authenticator ret_creds;
-	union netr_LogonLevel *logon;
+	union netr_LogonInfo *logon;
 	union netr_Validation validation;
 	uint8_t authoritative;
 	int validation_level = 3;
@@ -236,7 +236,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
 	ZERO_STRUCT(ret_creds);
 	ZERO_STRUCT(zeros);
 
-	logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+	logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonInfo);
 	if (!logon) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -407,7 +407,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 	uint8 zeros[16];
 	struct netr_Authenticator clnt_creds;
 	struct netr_Authenticator ret_creds;
-	union netr_LogonLevel *logon = NULL;
+	union netr_LogonInfo *logon = NULL;
 	struct netr_NetworkInfo *network_info;
 	uint8_t authoritative;
 	union netr_Validation validation;
@@ -424,7 +424,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 	ZERO_STRUCT(lm);
 	ZERO_STRUCT(nt);
 
-	logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+	logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonInfo);
 	if (!logon) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -530,7 +530,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
 	const char *workstation_name_slash;
 	const char *server_name_slash;
 	uint8 zeros[16];
-	union netr_LogonLevel *logon = NULL;
+	union netr_LogonInfo *logon = NULL;
 	struct netr_NetworkInfo *network_info;
 	uint8_t authoritative;
 	union netr_Validation validation;
@@ -547,7 +547,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
 	ZERO_STRUCT(lm);
 	ZERO_STRUCT(nt);
 
-	logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+	logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonInfo);
 	if (!logon) {
 		return NT_STATUS_NO_MEMORY;
 	}
diff --git a/source/rpc_server/srv_netlog_nt.c b/source/rpc_server/srv_netlog_nt.c
index f4967dc548a..4664e8d1ba3 100644
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -786,7 +786,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
 {
 	NTSTATUS status = NT_STATUS_OK;
 	struct netr_SamInfo3 *sam3 = NULL;
-	union netr_LogonLevel *logon = r->in.logon;
+	union netr_LogonInfo *logon = r->in.logon;
 	fstring nt_username, nt_domain, nt_workstation;
 	auth_usersupplied_info *user_info = NULL;
 	auth_serversupplied_info *server_info = NULL;