r17516: Change helper function names to make more clear what they are meant to do

(This used to be commit ad75cf869550af66119d0293503024d41d834e02)

2 files changed, 20 insertions, 20 deletions

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 9a76926375..000f4fd810 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -1167,9 +1167,9 @@ static NTSTATUS lsa_lookup_sid(struct lsa_policy_state *state, TALLOC_CTX *mem_c
 	ret = gendb_search(state->sam_ldb, mem_ctx, NULL, &res, attrs, 
 			   "objectSid=%s", ldap_encode_ndr_dom_sid(mem_ctx, sid));
 	if (ret == 1) {
-		*name = ldb_msg_find_string(res[0], "sAMAccountName", NULL);
+		*name = ldb_msg_find_attr_as_string(res[0], "sAMAccountName", NULL);
 		if (!*name) {
-			*name = ldb_msg_find_string(res[0], "name", NULL);
+			*name = ldb_msg_find_attr_as_string(res[0], "name", NULL);
 			if (!*name) {
 				*name = talloc_strdup(mem_ctx, sid_str);
 				NT_STATUS_HAVE_NO_MEMORY(*name);
@@ -2133,7 +2133,7 @@ static NTSTATUS lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
 			}
 
 			new_val = ldb_msg_find_ldb_val(res[0], "secret");
-			last_set_time = ldb_msg_find_uint64(res[0], "lastSetTime", 0);
+			last_set_time = ldb_msg_find_attr_as_uint64(res[0], "lastSetTime", 0);
 			
 			if (new_val) {
 				/* set value */
@@ -2237,7 +2237,7 @@ static NTSTATUS lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *
 		if (!r->out.old_mtime) {
 			return NT_STATUS_NO_MEMORY;
 		}
-		*r->out.old_mtime = ldb_msg_find_uint64(res[0], "priorSetTime", 0);
+		*r->out.old_mtime = ldb_msg_find_attr_as_uint64(res[0], "priorSetTime", 0);
 	}
 	
 	if (r->in.new_val) {
@@ -2273,7 +2273,7 @@ static NTSTATUS lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *
 		if (!r->out.new_mtime) {
 			return NT_STATUS_NO_MEMORY;
 		}
-		*r->out.new_mtime = ldb_msg_find_uint64(res[0], "lastSetTime", 0);
+		*r->out.new_mtime = ldb_msg_find_attr_as_uint64(res[0], "lastSetTime", 0);
 	}
 	
 	return NT_STATUS_OK;
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index e36c0e96ea..b3dadd14e1 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -391,13 +391,13 @@ static NTSTATUS samr_OpenDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX *
 				   "(&(&(nETBIOSName=*)(objectclass=crossRef))(ncName=%s))", 
 				   ldb_dn_linearize(mem_ctx, dom_msgs[0]->dn));
 		if (ret == 0) {
-			domain_name = ldb_msg_find_string(dom_msgs[0], "cn", NULL);
+			domain_name = ldb_msg_find_attr_as_string(dom_msgs[0], "cn", NULL);
 			if (domain_name == NULL) {
 				return NT_STATUS_NO_SUCH_DOMAIN;
 			}
 		} else if (ret == 1) {
 		
-			domain_name = ldb_msg_find_string(ref_msgs[0], "nETBIOSName", NULL);
+			domain_name = ldb_msg_find_attr_as_string(ref_msgs[0], "nETBIOSName", NULL);
 			if (domain_name == NULL) {
 				return NT_STATUS_NO_SUCH_DOMAIN;
 			}
@@ -464,7 +464,7 @@ static NTSTATUS samr_info_DomInfo2(struct samr_domain_state *state, TALLOC_CTX *
 				    struct ldb_message **dom_msgs,
 				   struct samr_DomInfo2 *info)
 {
-	info->force_logoff_time = ldb_msg_find_uint64(dom_msgs[0], "forceLogoff", 
+	info->force_logoff_time = ldb_msg_find_attr_as_uint64(dom_msgs[0], "forceLogoff", 
 							    0x8000000000000000LL);
 
 	info->comment.string = samdb_result_string(dom_msgs[0], "comment", NULL);
@@ -472,7 +472,7 @@ static NTSTATUS samr_info_DomInfo2(struct samr_domain_state *state, TALLOC_CTX *
 
 	/* FIXME:  We should find the name of the real PDC emulator */
 	info->primary.string = lp_netbios_name();
-	info->sequence_num = ldb_msg_find_uint64(dom_msgs[0], "modifiedCount", 
+	info->sequence_num = ldb_msg_find_attr_as_uint64(dom_msgs[0], "modifiedCount", 
 						 0);
 
 	info->role = lp_server_role();
@@ -498,7 +498,7 @@ static NTSTATUS samr_info_DomInfo3(struct samr_domain_state *state,
 				    struct ldb_message **dom_msgs,
 				   struct samr_DomInfo3 *info)
 {
-	info->force_logoff_time = ldb_msg_find_uint64(dom_msgs[0], "forceLogoff", 
+	info->force_logoff_time = ldb_msg_find_attr_as_uint64(dom_msgs[0], "forceLogoff", 
 						      0x8000000000000000LL);
 
 	return NT_STATUS_OK;
@@ -566,10 +566,10 @@ static NTSTATUS samr_info_DomInfo8(struct samr_domain_state *state,
 				    struct ldb_message **dom_msgs,
 				   struct samr_DomInfo8 *info)
 {
-	info->sequence_num = ldb_msg_find_uint64(dom_msgs[0], "modifiedCount", 
+	info->sequence_num = ldb_msg_find_attr_as_uint64(dom_msgs[0], "modifiedCount", 
 					       time(NULL));
 
-	info->domain_create_time = ldb_msg_find_uint(dom_msgs[0], "creationTime",
+	info->domain_create_time = ldb_msg_find_attr_as_uint(dom_msgs[0], "creationTime",
 						     0x0LL);
 
 	return NT_STATUS_OK;
@@ -602,11 +602,11 @@ static NTSTATUS samr_info_DomInfo11(struct samr_domain_state *state,
 		return status;
 	}
 	
-	info->lockout_duration = ldb_msg_find_int64(dom_msgs[0], "lockoutDuration", 
+	info->lockout_duration = ldb_msg_find_attr_as_int64(dom_msgs[0], "lockoutDuration", 
 						    -18000000000LL);
-	info->lockout_window = ldb_msg_find_int64(dom_msgs[0], "lockOutObservationWindow",
+	info->lockout_window = ldb_msg_find_attr_as_int64(dom_msgs[0], "lockOutObservationWindow",
 						    -18000000000LL);
-	info->lockout_threshold = ldb_msg_find_int64(dom_msgs[0], "lockoutThreshold", 0);
+	info->lockout_threshold = ldb_msg_find_attr_as_int64(dom_msgs[0], "lockoutThreshold", 0);
 
 	return NT_STATUS_OK;
 }
@@ -619,11 +619,11 @@ static NTSTATUS samr_info_DomInfo12(struct samr_domain_state *state,
 				    struct ldb_message **dom_msgs,
 				   struct samr_DomInfo12 *info)
 {
-	info->lockout_duration = ldb_msg_find_int64(dom_msgs[0], "lockoutDuration", 
+	info->lockout_duration = ldb_msg_find_attr_as_int64(dom_msgs[0], "lockoutDuration", 
 						    -18000000000LL);
-	info->lockout_window = ldb_msg_find_int64(dom_msgs[0], "lockOutObservationWindow",
+	info->lockout_window = ldb_msg_find_attr_as_int64(dom_msgs[0], "lockOutObservationWindow",
 						    -18000000000LL);
-	info->lockout_threshold = ldb_msg_find_int64(dom_msgs[0], "lockoutThreshold", 0);
+	info->lockout_threshold = ldb_msg_find_attr_as_int64(dom_msgs[0], "lockoutThreshold", 0);
 
 	return NT_STATUS_OK;
 }
@@ -636,10 +636,10 @@ static NTSTATUS samr_info_DomInfo13(struct samr_domain_state *state,
 				    struct ldb_message **dom_msgs,
 				    struct samr_DomInfo13 *info)
 {
-	info->sequence_num = ldb_msg_find_uint64(dom_msgs[0], "modifiedCount", 
+	info->sequence_num = ldb_msg_find_attr_as_uint64(dom_msgs[0], "modifiedCount", 
 					       time(NULL));
 
-	info->domain_create_time = ldb_msg_find_uint(dom_msgs[0], "creationTime",
+	info->domain_create_time = ldb_msg_find_attr_as_uint(dom_msgs[0], "creationTime",
 						     0x0LL);
 
 	info->unknown1 = 0;