r1025: Rename (across the samr and netlogon pipes, so far)

pwd -> password
passwd -> password

username -> account_name

Also work on consistant structure feild names between these two pipes,
and fix up some callers to use samr_Password for the netlogon
credential code.

Andrew Bartlett
(This used to be commit 4e35418c2776f7b79be5b358ffd077754685d1ac)

4 files changed, 58 insertions, 96 deletions

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index ea76be44f5..e159123c87 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -56,16 +56,6 @@ static void netlogon_unbind(struct dcesrv_connection *conn, const struct dcesrv_
 #define DCESRV_INTERFACE_NETLOGON_BIND netlogon_bind
 #define DCESRV_INTERFACE_NETLOGON_UNBIND netlogon_unbind
 
-/* 
-  netr_ServerReqChallenge 
-
-	NTSTATUS netr_ServerReqChallenge(
-		[in]         unistr *server_name,
-		[in]         unistr computer_name,
-		[in,out,ref] netr_Credential *credentials
-		);
-
-*/
 static NTSTATUS netr_ServerReqChallenge(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 					struct netr_ServerReqChallenge *r)
 {
@@ -113,32 +103,12 @@ static NTSTATUS netr_ServerReqChallenge(struct dcesrv_call_state *dce_call, TALL
 	return NT_STATUS_OK;
 }
 
-
-/* 
-  netr_ServerAuthenticate 
-
-	 secure channel types:
- 
-	const int SEC_CHAN_WKSTA   = 2;
-	const int SEC_CHAN_DOMAIN  = 4;
-	const int SEC_CHAN_BDC     = 6;
-
-	NTSTATUS netr_ServerAuthenticate3(
-		[in]         unistr *server_name,
-		[in]         unistr username,
-		[in]         uint16 secure_channel_type,
-		[in]         unistr computer_name,
-		[in,out,ref] netr_Credential *credentials
-		[in,out,ref] uint32 *negotiate_flags,
-		[out,ref]    uint32 *rid
-		);
-*/
 static NTSTATUS netr_ServerAuthenticate3(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 					 struct netr_ServerAuthenticate3 *r)
 {
 	struct server_pipe_state *pipe_state = dce_call->conn->private;
 	void *sam_ctx;
-	uint8_t *mach_pwd;
+	struct samr_Password *mach_pwd;
 	uint16_t acct_flags;
 	int num_records;
 	struct ldb_message **msgs;
@@ -162,17 +132,17 @@ static NTSTATUS netr_ServerAuthenticate3(struct dcesrv_call_state *dce_call, TAL
 	/* pull the user attributes */
 	num_records = samdb_search(sam_ctx, mem_ctx, NULL, &msgs, attrs,
 				   "(&(sAMAccountName=%s)(objectclass=user))", 
-				   r->in.username);
+				   r->in.account_name);
 
 	if (num_records == 0) {
 		DEBUG(3,("Couldn't find user [%s] in samdb.\n", 
-			 r->in.username));
+			 r->in.account_name));
 		samdb_close(sam_ctx);
 		return NT_STATUS_NO_SUCH_USER;
 	}
 
 	if (num_records > 1) {
-		DEBUG(1,("Found %d records matching user [%s]\n", num_records, r->in.username));
+		DEBUG(1,("Found %d records matching user [%s]\n", num_records, r->in.account_name));
 		samdb_close(sam_ctx);
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -181,7 +151,7 @@ static NTSTATUS netr_ServerAuthenticate3(struct dcesrv_call_state *dce_call, TAL
 					     "userAccountControl");
 
 	if (acct_flags & ACB_DISABLED) {
-		DEBUG(1, ("Account [%s] is disabled\n", r->in.username));
+		DEBUG(1, ("Account [%s] is disabled\n", r->in.account_name));
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
@@ -242,7 +212,7 @@ static NTSTATUS netr_ServerAuthenticate3(struct dcesrv_call_state *dce_call, TAL
 		talloc_free(pipe_state->mem_ctx, pipe_state->account_name);
 	}
 
-	pipe_state->account_name = talloc_strdup(pipe_state->mem_ctx, r->in.username);
+	pipe_state->account_name = talloc_strdup(pipe_state->mem_ctx, r->in.account_name);
 	
 	if (pipe_state->computer_name) {
 		/* We don't want a memory leak on this long-lived talloc context */
@@ -265,7 +235,7 @@ static NTSTATUS netr_ServerAuthenticate(struct dcesrv_call_state *dce_call, TALL
 	uint32 negotiate_flags, rid;
 
 	r3.in.server_name = r->in.server_name;
-	r3.in.username = r->in.username;
+	r3.in.account_name = r->in.account_name;
 	r3.in.secure_channel_type = r->in.secure_channel_type;
 	r3.in.computer_name = r->in.computer_name;
 	r3.in.credentials = r->in.credentials;
@@ -284,7 +254,7 @@ static NTSTATUS netr_ServerAuthenticate2(struct dcesrv_call_state *dce_call, TAL
 	uint32 rid;
 
 	r3.in.server_name = r->in.server_name;
-	r3.in.username = r->in.username;
+	r3.in.account_name = r->in.account_name;
 	r3.in.secure_channel_type = r->in.secure_channel_type;
 	r3.in.computer_name = r->in.computer_name;
 	r3.in.credentials = r->in.credentials;
@@ -309,20 +279,7 @@ static BOOL netr_creds_server_step_check(struct server_pipe_state *pipe_state,
 				       return_authenticator);
 }
 
-/* 
- netr_ServerPasswordSet 
-
- 	NTSTATUS netr_ServerPasswordSet(
-		[in]  unistr *server_name,
-		[in]  unistr username,
-		[in]  uint16 secure_channel_type,
-		[in]  unistr computer_name,
-		[in]  netr_Authenticator credential,
-		[in]  netr_Password new_password,
-		[out] netr_Authenticator return_authenticator
-		);
 
-*/
 static NTSTATUS netr_ServerPasswordSet(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				       struct netr_ServerPasswordSet *r)
 {
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index eb9f58cfb4..3b590baa6e 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -622,7 +622,7 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
 	const char *name;
 	struct ldb_message msg;
 	uint32_t rid;
-	const char *username, *sidstr;
+	const char *account_name, *sidstr;
 	time_t now = time(NULL);
 	TALLOC_CTX *mem_ctx2;
 	struct dcesrv_handle *u_handle;
@@ -638,16 +638,16 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
 	d_state = h->data;
 
-	username = r->in.username->name;
+	account_name = r->in.account_name->name;
 
-	if (username == NULL) {
+	if (account_name == NULL) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
 	/* check if the user already exists */
 	name = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL, 
 				   "sAMAccountName", 
-				   "(&(sAMAccountName=%s)(objectclass=user))", username);
+				   "(&(sAMAccountName=%s)(objectclass=user))", account_name);
 	if (name != NULL) {
 		return NT_STATUS_USER_EXISTS;
 	}
@@ -720,13 +720,13 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
 	}
 
 	/* add core elements to the ldb_message for the user */
-	msg.dn = talloc_asprintf(mem_ctx, "CN=%s,CN=%s,%s", username, container, d_state->domain_dn);
+	msg.dn = talloc_asprintf(mem_ctx, "CN=%s,CN=%s,%s", account_name, container, d_state->domain_dn);
 	if (!msg.dn) {
 		return NT_STATUS_NO_MEMORY;		
 	}
-	samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "name", username);
-	samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "cn", username);
-	samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "sAMAccountName", username);
+	samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "name", account_name);
+	samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "cn", account_name);
+	samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "sAMAccountName", account_name);
 	samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectClass", "user");
 	if (additional_class) {
 		samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectClass", additional_class);
@@ -743,7 +743,7 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
 	}
 
 	/* create user state and new policy handle */
-	mem_ctx2 = talloc_init("CreateUser(%s)", username);
+	mem_ctx2 = talloc_init("CreateUser(%s)", account_name);
 	if (!mem_ctx2) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -758,7 +758,7 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
 	a_state->domain_state = d_state;
 	a_state->account_dn = talloc_steal(mem_ctx, mem_ctx2, msg.dn);
 	a_state->account_sid = talloc_strdup(mem_ctx2, sidstr);
-	a_state->account_name = talloc_strdup(mem_ctx2, username);
+	a_state->account_name = talloc_strdup(mem_ctx2, account_name);
 	if (!a_state->account_name || !a_state->account_sid) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -795,7 +795,7 @@ static NTSTATUS samr_CreateUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *
 
 	/* a simple wrapper around samr_CreateUser2 works nicely */
 	r2.in.handle = r->in.handle;
-	r2.in.username = r->in.username;
+	r2.in.account_name = r->in.account_name;
 	r2.in.acct_flags = ACB_NORMAL;
 	r2.in.access_mask = r->in.access_mask;
 	r2.out.acct_handle = r->out.acct_handle;
@@ -1109,10 +1109,10 @@ static NTSTATUS samr_OpenGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
 #define QUERY_NTTIME(msg, field, attr) \
 	r->out.info->field = samdb_result_nttime(msg, attr, 0);
 #define QUERY_APASSC(msg, field, attr) \
-	r->out.info->field = samdb_result_allow_pwd_change(a_state->sam_ctx, mem_ctx, \
+	r->out.info->field = samdb_result_allow_password_change(a_state->sam_ctx, mem_ctx, \
 							   a_state->domain_state->domain_dn, msg, attr);
 #define QUERY_FPASSC(msg, field, attr) \
-	r->out.info->field = samdb_result_force_pwd_change(a_state->sam_ctx, mem_ctx, \
+	r->out.info->field = samdb_result_force_password_change(a_state->sam_ctx, mem_ctx, \
 							   a_state->domain_state->domain_dn, msg, attr);
 #define QUERY_LHOURS(msg, field, attr) \
 	r->out.info->field = samdb_result_logon_hours(mem_ctx, msg, attr);
@@ -1401,7 +1401,7 @@ static NTSTATUS samr_OpenUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
 	struct samr_domain_state *d_state;
 	struct samr_account_state *a_state;
 	struct dcesrv_handle *h;
-	const char *username, *sidstr;
+	const char *account_name, *sidstr;
 	TALLOC_CTX *mem_ctx2;
 	struct ldb_message **msgs;
 	struct dcesrv_handle *u_handle;
@@ -1433,8 +1433,8 @@ static NTSTATUS samr_OpenUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 
-	username = samdb_result_string(msgs[0], "sAMAccountName", NULL);
-	if (username == NULL) {
+	account_name = samdb_result_string(msgs[0], "sAMAccountName", NULL);
+	if (account_name == NULL) {
 		DEBUG(1,("sAMAccountName field missing for sid %s\n", sidstr));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -1455,7 +1455,7 @@ static NTSTATUS samr_OpenUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
 	a_state->domain_state = d_state;
 	a_state->account_dn = talloc_steal(mem_ctx, mem_ctx2, msgs[0]->dn);
 	a_state->account_sid = talloc_strdup(mem_ctx2, sidstr);
-	a_state->account_name = talloc_strdup(mem_ctx2, username);
+	a_state->account_name = talloc_strdup(mem_ctx2, account_name);
 	if (!a_state->account_name || !a_state->account_sid) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -1541,7 +1541,7 @@ static NTSTATUS samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 	/* fill in the reply */
 	switch (r->in.level) {
 	case 1:
-		QUERY_STRING(msg, info1.username.name,    "sAMAccountName");
+		QUERY_STRING(msg, info1.account_name.name,"sAMAccountName");
 		QUERY_STRING(msg, info1.full_name.name,   "displayName");
 		QUERY_UINT  (msg, info1.primary_gid,      "primaryGroupID");
 		QUERY_STRING(msg, info1.description.name, "description");
@@ -1555,22 +1555,22 @@ static NTSTATUS samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 		break;
 
 	case 3:
-		QUERY_STRING(msg, info3.username.name,       "sAMAccountName");
+		QUERY_STRING(msg, info3.account_name.name,   "sAMAccountName");
 		QUERY_STRING(msg, info3.full_name.name,      "displayName");
 		QUERY_RID   (msg, info3.rid,                 "objectSid");
 		QUERY_UINT  (msg, info3.primary_gid,         "primaryGroupID");
 		QUERY_STRING(msg, info3.home_directory.name, "homeDirectory");
 		QUERY_STRING(msg, info3.home_drive.name,     "homeDrive");
 		QUERY_STRING(msg, info3.logon_script.name,   "scriptPath");
-		QUERY_STRING(msg, info3.profile.name,        "profilePath");
+		QUERY_STRING(msg, info3.profile_path.name,   "profilePath");
 		QUERY_STRING(msg, info3.workstations.name,   "userWorkstations");
 		QUERY_NTTIME(msg, info3.last_logon,          "lastLogon");
 		QUERY_NTTIME(msg, info3.last_logoff,         "lastLogoff");
-		QUERY_NTTIME(msg, info3.last_pwd_change,     "pwdLastSet");
-		QUERY_APASSC(msg, info3.allow_pwd_change,    "pwdLastSet");
-		QUERY_FPASSC(msg, info3.force_pwd_change,    "pwdLastSet");
+		QUERY_NTTIME(msg, info3.last_password_change,"pwdLastSet");
+		QUERY_APASSC(msg, info3.allow_password_change,"pwdLastSet");
+		QUERY_FPASSC(msg, info3.force_password_change,"pwdLastSet");
 		QUERY_LHOURS(msg, info3.logon_hours,         "logonHours");
-		QUERY_UINT  (msg, info3.bad_pwd_count,       "badPwdCount");
+		QUERY_UINT  (msg, info3.bad_password_count,  "badPwdCount");
 		QUERY_UINT  (msg, info3.num_logons,          "logonCount");
 		QUERY_AFLAGS(msg, info3.acct_flags,          "userAccountControl");
 		break;
@@ -1580,33 +1580,33 @@ static NTSTATUS samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 		break;
 
 	case 5:
-		QUERY_STRING(msg, info5.username.name,       "sAMAccountName");
+		QUERY_STRING(msg, info5.account_name.name,   "sAMAccountName");
 		QUERY_STRING(msg, info5.full_name.name,      "displayName");
 		QUERY_RID   (msg, info5.rid,                 "objectSid");
 		QUERY_UINT  (msg, info5.primary_gid,         "primaryGroupID");
 		QUERY_STRING(msg, info5.home_directory.name, "homeDirectory");
 		QUERY_STRING(msg, info5.home_drive.name,     "homeDrive");
 		QUERY_STRING(msg, info5.logon_script.name,   "scriptPath");
-		QUERY_STRING(msg, info5.profile.name,        "profilePath");
+		QUERY_STRING(msg, info5.profile_path.name,   "profilePath");
 		QUERY_STRING(msg, info5.description.name,    "description");
 		QUERY_STRING(msg, info5.workstations.name,   "userWorkstations");
 		QUERY_NTTIME(msg, info5.last_logon,          "lastLogon");
 		QUERY_NTTIME(msg, info5.last_logoff,         "lastLogoff");
 		QUERY_LHOURS(msg, info5.logon_hours,         "logonHours");
-		QUERY_UINT  (msg, info5.bad_pwd_count,       "badPwdCount");
+		QUERY_UINT  (msg, info5.bad_password_count,  "badPwdCount");
 		QUERY_UINT  (msg, info5.num_logons,          "logonCount");
-		QUERY_NTTIME(msg, info5.last_pwd_change,     "pwdLastSet");
+		QUERY_NTTIME(msg, info5.last_password_change,"pwdLastSet");
 		QUERY_NTTIME(msg, info5.acct_expiry,         "accountExpires");
 		QUERY_AFLAGS(msg, info5.acct_flags,          "userAccountControl");
 		break;
 
 	case 6:
-		QUERY_STRING(msg, info6.username.name,       "sAMAccountName");
+		QUERY_STRING(msg, info6.account_name.name,   "sAMAccountName");
 		QUERY_STRING(msg, info6.full_name.name,      "displayName");
 		break;
 
 	case 7:
-		QUERY_STRING(msg, info7.username.name,       "sAMAccountName");
+		QUERY_STRING(msg, info7.account_name.name,   "sAMAccountName");
 		break;
 
 	case 8:
@@ -1652,11 +1652,11 @@ static NTSTATUS samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 	case 21:
 		QUERY_NTTIME(msg, info21.last_logon,          "lastLogon");
 		QUERY_NTTIME(msg, info21.last_logoff,         "lastLogoff");
-		QUERY_NTTIME(msg, info21.last_pwd_change,     "pwdLastSet");
+		QUERY_NTTIME(msg, info21.last_password_change,     "pwdLastSet");
 		QUERY_NTTIME(msg, info21.acct_expiry,         "accountExpires");
-		QUERY_APASSC(msg, info21.allow_pwd_change,    "pwdLastSet");
-		QUERY_FPASSC(msg, info21.force_pwd_change,    "pwdLastSet");
-		QUERY_STRING(msg, info21.username.name,       "sAMAccountName");
+		QUERY_APASSC(msg, info21.allow_password_change,    "pwdLastSet");
+		QUERY_FPASSC(msg, info21.force_password_change,    "pwdLastSet");
+		QUERY_STRING(msg, info21.account_name.name,       "sAMAccountName");
 		QUERY_STRING(msg, info21.full_name.name,      "displayName");
 		QUERY_STRING(msg, info21.home_directory.name, "homeDirectory");
 		QUERY_STRING(msg, info21.home_drive.name,     "homeDrive");
@@ -1671,7 +1671,7 @@ static NTSTATUS samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 		QUERY_AFLAGS(msg, info21.acct_flags,          "userAccountControl");
 		r->out.info->info21.fields_present = 0x00FFFFFF;
 		QUERY_LHOURS(msg, info21.logon_hours,         "logonHours");
-		QUERY_UINT  (msg, info21.bad_pwd_count,       "badPwdCount");
+		QUERY_UINT  (msg, info21.bad_password_count,  "badPwdCount");
 		QUERY_UINT  (msg, info21.num_logons,          "logonCount");
 		QUERY_UINT  (msg, info21.country_code,        "countryCode");
 		QUERY_UINT  (msg, info21.code_page,           "codePage");
@@ -1958,7 +1958,7 @@ static NTSTATUS samr_GetUserPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 
 	a_state = h->data;
 
-	r->out.info.min_pwd_len = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "minPwdLength", 
+	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.password_properties = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "pwdProperties", 
 							    "dn=%s", a_state->account_dn);
@@ -2095,7 +2095,7 @@ static NTSTATUS samr_GetDomPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 
-	r->out.info.min_pwd_len         = samdb_result_uint(msgs[0], "minPwdLength", 0);
+	r->out.info.min_password_len         = 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/samdb.c b/source4/rpc_server/samr/samdb.c
index 872ec82894..c188e917a7 100644
--- a/source4/rpc_server/samr/samdb.c
+++ b/source4/rpc_server/samr/samdb.c
@@ -427,11 +427,13 @@ uint64_t samdb_result_uint64(struct ldb_message *msg, const char *attr, uint64_t
 
 
 /*
-  construct the allow_pwd_change field from the PwdLastSet attribute and the 
+  construct the allow_password_change field from the PwdLastSet attribute and the 
   domain password settings
 */
-NTTIME samdb_result_allow_pwd_change(void *ctx, TALLOC_CTX *mem_ctx, 
-				     const char *domain_dn, struct ldb_message *msg, const char *attr)
+NTTIME samdb_result_allow_password_change(void *ctx, TALLOC_CTX *mem_ctx, 
+					  const char *domain_dn, 
+					  struct ldb_message *msg, 
+					  const char *attr)
 {
 	uint64_t attr_time = samdb_result_uint64(msg, attr, 0);
 	int64_t minPwdAge;
@@ -440,7 +442,8 @@ NTTIME samdb_result_allow_pwd_change(void *ctx, TALLOC_CTX *mem_ctx,
 		return 0;
 	}
 
-	minPwdAge = samdb_search_int64(ctx, mem_ctx, 0, NULL, "minPwdAge", "dn=%s", domain_dn);
+	minPwdAge = samdb_search_int64(ctx, mem_ctx, 0, NULL, 
+				       "minPwdAge", "dn=%s", domain_dn);
 
 	/* yes, this is a -= not a += as minPwdAge is stored as the negative
 	   of the number of 100-nano-seconds */
@@ -450,11 +453,13 @@ NTTIME samdb_result_allow_pwd_change(void *ctx, TALLOC_CTX *mem_ctx,
 }
 
 /*
-  construct the force_pwd_change field from the PwdLastSet attribute and the 
+  construct the force_password_change field from the PwdLastSet attribute and the 
   domain password settings
 */
-NTTIME samdb_result_force_pwd_change(void *ctx, TALLOC_CTX *mem_ctx, 
-				     const char *domain_dn, struct ldb_message *msg, const char *attr)
+NTTIME samdb_result_force_password_change(void *ctx, TALLOC_CTX *mem_ctx, 
+					  const char *domain_dn, 
+					  struct ldb_message *msg, 
+					  const char *attr)
 {
 	uint64_t attr_time = samdb_result_uint64(msg, attr, 0);
 	int64_t maxPwdAge;
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index b1dc4a7f6b..95e783f072 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -381,7 +381,7 @@ failed:
 		return status;
 	}
 
-	dominfo->min_pwd_len         = samdb_result_uint (res[0], "minPwdLength", 0);
+	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);