r3804: Add more comparison tests in RPC-SAMSYNC.

This compares values for the domain and for secrets.  We still have
some problems we need to sort out for secrets.

Also rename a number of structures in samr.idl and netlogon.idl, to
better express their consistancy.

Andrew Bartlett
(This used to be commit 3f52fa3a42b030c9aef21c8bd88aad87a0aae078)

2 files changed, 8 insertions, 8 deletions

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 6d67c974fd..18cf2c4734 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -1894,8 +1894,8 @@ static NTSTATUS samr_GetUserPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 
 	a_state = h->data;
 
-	r->out.info.min_password_len = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "minPwdLength", 
-						    "dn=%s", a_state->domain_state->domain_dn);
+	r->out.info.min_password_length = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "minPwdLength", 
+							    "dn=%s", a_state->domain_state->domain_dn);
 	r->out.info.password_properties = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "pwdProperties", 
 							    "dn=%s", a_state->account_dn);
 	return NT_STATUS_OK;
@@ -2029,7 +2029,7 @@ static NTSTATUS samr_GetDomPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 
-	r->out.info.min_password_len         = samdb_result_uint(msgs[0], "minPwdLength", 0);
+	r->out.info.min_password_length = samdb_result_uint(msgs[0], "minPwdLength", 0);
 	r->out.info.password_properties = samdb_result_uint(msgs[0], "pwdProperties", 1);
 
 	samdb_search_free(sam_ctx, mem_ctx, msgs);
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 8e88abfc16..6f99508122 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -374,11 +374,11 @@ failed:
 		return status;
 	}
 
-	dominfo->min_password_len    = samdb_result_uint (res[0], "minPwdLength", 0);
-	dominfo->password_properties = samdb_result_uint (res[0], "pwdProperties", 0);
-	dominfo->password_history    = samdb_result_uint (res[0], "pwdHistoryLength", 0);
-	dominfo->max_password_age    = samdb_result_int64(res[0], "maxPwdAge", 0);
-	dominfo->min_password_age    = samdb_result_int64(res[0], "minPwdAge", 0);
+	dominfo->min_password_length     = samdb_result_uint (res[0], "minPwdLength", 0);
+	dominfo->password_properties     = samdb_result_uint (res[0], "pwdProperties", 0);
+	dominfo->password_history_length = samdb_result_uint (res[0], "pwdHistoryLength", 0);
+	dominfo->max_password_age        = samdb_result_int64(res[0], "maxPwdAge", 0);
+	dominfo->min_password_age        = samdb_result_int64(res[0], "minPwdAge", 0);
 
 	return status;
 }