idl: Improve MS-PAC IDL

Change some misleading variable names to reflect the actual function.
Add missing field name/types previously marked as unkown.

Signed-off-by: Günther Deschner <gd@samba.org>

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Oct 24 19:19:28 CEST 2011 on sn-devel-104

4 files changed, 20 insertions, 16 deletions

diff --git a/source4/auth/ntlm/auth_winbind.c b/source4/auth/ntlm/auth_winbind.c
index 63827ef755..34fe6f870c 100644
--- a/source4/auth/ntlm/auth_winbind.c
+++ b/source4/auth/ntlm/auth_winbind.c
@@ -45,9 +45,9 @@ static NTSTATUS get_info3_from_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
 	user_sid = (struct dom_sid *)(void *)&info->sids[0].sid;
 	group_sid = (struct dom_sid *)(void *)&info->sids[1].sid;
 
-	info3->base.last_logon = info->logon_time;
-	info3->base.last_logoff = info->logoff_time;
-	info3->base.acct_expiry = info->kickoff_time;
+	info3->base.logon_time = info->logon_time;
+	info3->base.logoff_time = info->logoff_time;
+	info3->base.kickoff_time = info->kickoff_time;
 	info3->base.last_password_change = info->pass_last_set_time;
 	info3->base.allow_password_change = info->pass_can_change_time;
 	info3->base.force_password_change = info->pass_must_change_time;
@@ -66,7 +66,7 @@ static NTSTATUS get_info3_from_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
 						      info->home_drive);
 	info3->base.logon_server.string = talloc_strdup(mem_ctx,
 							info->logon_server);
-	info3->base.domain.string = talloc_strdup(mem_ctx,
+	info3->base.logon_domain.string = talloc_strdup(mem_ctx,
 						  info->domain_name);
 
 	info3->base.logon_count = info->logon_count;
@@ -77,7 +77,11 @@ static NTSTATUS get_info3_from_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
 	memcpy(info3->base.LMSessKey.key, info->lm_session_key,
 	       sizeof(info3->base.LMSessKey.key));
 	info3->base.acct_flags = info->acct_flags;
-	memset(info3->base.unknown, 0, sizeof(info3->base.unknown));
+	info3->base.sub_auth_status = 0;
+	info3->base.last_successful_logon = 0;
+	info3->base.last_failed_logon = 0;
+	info3->base.failed_logon_count = 0;
+	info3->base.reserved = 0;
 
 	if (info->num_sids < 2) {
 		return NT_STATUS_INVALID_PARAMETER;
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index fd1fbbff1f..b92eb21985 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -684,8 +684,8 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
 		TEST_STRING_EQUAL(user->logon_script, info3->base.logon_script);
 
 
-		TEST_TIME_EQUAL(user->last_logon, info3->base.last_logon);
-		TEST_TIME_EQUAL(user->acct_expiry, info3->base.acct_expiry);
+		TEST_TIME_EQUAL(user->last_logon, info3->base.logon_time);
+		TEST_TIME_EQUAL(user->acct_expiry, info3->base.kickoff_time);
 		TEST_TIME_EQUAL(user->last_password_change, info3->base.last_password_change);
 		TEST_TIME_EQUAL(info->info21.force_password_change, info3->base.force_password_change);
 
@@ -696,8 +696,8 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
 		/* This copes with the two different versions of 0 I see */
 		/* with NT4 sp6 we have the || case */
 		if (!((user->last_logoff == 0)
-		      || (info3->base.last_logoff == 0x7fffffffffffffffLL))) {
-			TEST_TIME_EQUAL(user->last_logoff, info3->base.last_logoff);
+		      || (info3->base.logoff_time == 0x7fffffffffffffffLL))) {
+			TEST_TIME_EQUAL(user->last_logoff, info3->base.logoff_time);
 		}
 
 		TEST_INT_EQUAL(rids->count, info3->base.groups.count);
diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c
index e09addac73..bcbc6286b5 100644
--- a/source4/winbind/wb_pam_auth.c
+++ b/source4/winbind/wb_pam_auth.c
@@ -170,9 +170,9 @@ static void pam_auth_crap_recv_logon(struct composite_context *ctx)
 		state->user_name = base->account_name.string;
 		talloc_steal(state, base->account_name.string);
 	}
-	if (base->domain.string) {
-		state->domain_name = base->domain.string;
-		talloc_steal(state, base->domain.string);
+	if (base->logon_domain.string) {
+		state->domain_name = base->logon_domain.string;
+		talloc_steal(state, base->logon_domain.string);
 	}
 
 	state->unix_username = talloc_asprintf(state, "%s%s%s", 
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 679a2a2335..54b1dcc39c 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -61,11 +61,11 @@ static NTSTATUS wb_samba3_append_info3_as_txt(TALLOC_CTX *mem_ctx,
 	}
 
 	s3call->response->data.auth.info3.logon_time =
-		nt_time_to_unix(info3->base.last_logon);
+		nt_time_to_unix(info3->base.logon_time);
 	s3call->response->data.auth.info3.logoff_time =
-		nt_time_to_unix(info3->base.last_logoff);
+		nt_time_to_unix(info3->base.logoff_time);
 	s3call->response->data.auth.info3.kickoff_time =
-		nt_time_to_unix(info3->base.acct_expiry);
+		nt_time_to_unix(info3->base.kickoff_time);
 	s3call->response->data.auth.info3.pass_last_set_time =
 		nt_time_to_unix(info3->base.last_password_change);
 	s3call->response->data.auth.info3.pass_can_change_time =
@@ -102,7 +102,7 @@ static NTSTATUS wb_samba3_append_info3_as_txt(TALLOC_CTX *mem_ctx,
 	fstrcpy(s3call->response->data.auth.info3.logon_srv,
 		info3->base.logon_server.string);
 	fstrcpy(s3call->response->data.auth.info3.logon_dom,
-		info3->base.domain.string);
+		info3->base.logon_domain.string);
 
 	ex = talloc_strdup(mem_ctx, "");
 	NT_STATUS_HAVE_NO_MEMORY(ex);