r18188: merge 3.0-libndr branch

(This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)

3 files changed, 14 insertions, 14 deletions

diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index e93dcefc90..27d37267b5 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -215,9 +215,9 @@ static NTTIME centry_nttime(struct cache_entry *centry)
 			 centry->len - centry->ofs));
 		smb_panic("centry_nttime");
 	}
-	ret.low = IVAL(centry->data, centry->ofs);
+	ret = IVAL(centry->data, centry->ofs);
 	centry->ofs += 4;
-	ret.high = IVAL(centry->data, centry->ofs);
+	ret += (uint64_t)IVAL(centry->data, centry->ofs) << 32;
 	centry->ofs += 4;
 	return ret;
 }
@@ -685,9 +685,9 @@ static void centry_put_sid(struct cache_entry *centry, const DOM_SID *sid)
 static void centry_put_nttime(struct cache_entry *centry, NTTIME nt)
 {
 	centry_expand(centry, 8);
-	SIVAL(centry->data, centry->ofs, nt.low);
+	SIVAL(centry->data, centry->ofs, nt & 0xFFFFFFFF);
 	centry->ofs += 4;
-	SIVAL(centry->data, centry->ofs, nt.high);
+	SIVAL(centry->data, centry->ofs, nt >> 32);
 	centry->ofs += 4;
 }
 
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index efdd0e874f..16e8380165 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -35,17 +35,17 @@ static NTSTATUS append_info3_as_txt(TALLOC_CTX *mem_ctx,
 	fstring str_sid;
 
 	state->response.data.auth.info3.logon_time = 
-		nt_time_to_unix(&(info3->logon_time));
+		nt_time_to_unix(info3->logon_time);
 	state->response.data.auth.info3.logoff_time = 
-		nt_time_to_unix(&(info3->logoff_time));
+		nt_time_to_unix(info3->logoff_time);
 	state->response.data.auth.info3.kickoff_time = 
-		nt_time_to_unix(&(info3->kickoff_time));
+		nt_time_to_unix(info3->kickoff_time);
 	state->response.data.auth.info3.pass_last_set_time = 
-		nt_time_to_unix(&(info3->pass_last_set_time));
+		nt_time_to_unix(info3->pass_last_set_time);
 	state->response.data.auth.info3.pass_can_change_time = 
-		nt_time_to_unix(&(info3->pass_can_change_time));
+		nt_time_to_unix(info3->pass_can_change_time);
 	state->response.data.auth.info3.pass_must_change_time = 
-		nt_time_to_unix(&(info3->pass_must_change_time));
+		nt_time_to_unix(info3->pass_must_change_time);
 
 	state->response.data.auth.info3.logon_count = info3->logon_count;
 	state->response.data.auth.info3.bad_pw_count = info3->bad_pw_count;
@@ -819,12 +819,12 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
 			return NT_STATUS_LOGON_FAILURE;
 		}
 #endif
-		kickoff_time = nt_time_to_unix(&my_info3->kickoff_time);
+		kickoff_time = nt_time_to_unix(my_info3->kickoff_time);
 		if (kickoff_time != 0 && time(NULL) > kickoff_time) {
 			return NT_STATUS_ACCOUNT_EXPIRED;
 		}
 
-		must_change_time = nt_time_to_unix(&my_info3->pass_must_change_time);
+		must_change_time = nt_time_to_unix(my_info3->pass_must_change_time);
 		if (must_change_time != 0 && must_change_time < time(NULL)) {
 			return NT_STATUS_PASSWORD_EXPIRED;
 		}
diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c
index f4676cc2fe..122e2c98e0 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/nsswitch/winbindd_rpc.c
@@ -868,7 +868,7 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
 	result = rpccli_samr_query_dom_info(cli, mem_ctx, &dom_pol, 8, &ctr);
 
 	if (NT_STATUS_IS_OK(result)) {
-		*seq = ctr.info.inf8.seq_num.low;
+		*seq = ctr.info.inf8.seq_num;
 		got_seq_num = True;
 		goto seq_num;
 	}
@@ -879,7 +879,7 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
 	result = rpccli_samr_query_dom_info(cli, mem_ctx, &dom_pol, 2, &ctr);
 	
 	if (NT_STATUS_IS_OK(result)) {
-		*seq = ctr.info.inf2.seq_num.low;
+		*seq = ctr.info.inf2.seq_num;
 		got_seq_num = True;
 	}