s4:dsdb - remove "samdb_result_uint", "samdb_result_int64", "samdb_result_uint64" and "samdb_result_string"

We have ldb_msg_find_attr_as_* calls which do exactly the same. Therefore this
reduces only code redundancies.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

3 files changed, 26 insertions, 18 deletions

diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index 3fac49fe54..6df140fed3 100644
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -811,7 +811,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
 			return WERR_OK;
 		}
 
-		info1->dns_domain_name	= samdb_result_string(domain_res->msgs[0], "dnsRoot", NULL);
+		info1->dns_domain_name	= ldb_msg_find_attr_as_string(domain_res->msgs[0], "dnsRoot", NULL);
 		W_ERROR_HAVE_NO_MEMORY(info1->dns_domain_name);
 		info1->status		= DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY;
 	} else {
@@ -939,7 +939,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
 		return WERR_OK;
 	}
 	case DRSUAPI_DS_NAME_FORMAT_CANONICAL: {
-		info1->result_name	= samdb_result_string(result, "canonicalName", NULL);
+		info1->result_name	= ldb_msg_find_attr_as_string(result, "canonicalName", NULL);
 		info1->status		= DRSUAPI_DS_NAME_STATUS_OK;
 		return WERR_OK;
 	}
@@ -979,10 +979,10 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
 				info1->status = DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE;
 				return WERR_OK;
 			}
-			_dom = samdb_result_string(domain_res->msgs[0], "nETBIOSName", NULL);
+			_dom = ldb_msg_find_attr_as_string(domain_res->msgs[0], "nETBIOSName", NULL);
 			W_ERROR_HAVE_NO_MEMORY(_dom);
 		} else {
-			_acc = samdb_result_string(result, "sAMAccountName", NULL);
+			_acc = ldb_msg_find_attr_as_string(result, "sAMAccountName", NULL);
 			if (!_acc) {
 				info1->status = DRSUAPI_DS_NAME_STATUS_NO_MAPPING;
 				return WERR_OK;
@@ -1043,7 +1043,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
 					info1->status = DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE;
 					return WERR_OK;
 				}
-				_dom = samdb_result_string(domain_res2->msgs[0], "nETBIOSName", NULL);
+				_dom = ldb_msg_find_attr_as_string(domain_res2->msgs[0], "nETBIOSName", NULL);
 				W_ERROR_HAVE_NO_MEMORY(_dom);
 			}
 		}
@@ -1066,9 +1066,9 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
 		return WERR_OK;
 	}
 	case DRSUAPI_DS_NAME_FORMAT_DISPLAY: {
-		info1->result_name	= samdb_result_string(result, "displayName", NULL);
+		info1->result_name	= ldb_msg_find_attr_as_string(result, "displayName", NULL);
 		if (!info1->result_name) {
-			info1->result_name	= samdb_result_string(result, "sAMAccountName", NULL);
+			info1->result_name	= ldb_msg_find_attr_as_string(result, "sAMAccountName", NULL);
 		} 
 		if (!info1->result_name) {
 			info1->status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 488b8b7d33..c9748af698 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -1658,10 +1658,13 @@ static int setup_io(struct ph_context *ac,
 
 	io->ac				= ac;
 
-	io->u.userAccountControl	= samdb_result_uint(searched_msg, "userAccountControl", 0);
+	io->u.userAccountControl	= ldb_msg_find_attr_as_uint(searched_msg,
+								    "userAccountControl", 0);
 	io->u.pwdLastSet		= samdb_result_nttime(searched_msg, "pwdLastSet", 0);
-	io->u.sAMAccountName		= samdb_result_string(searched_msg, "sAMAccountName", NULL);
-	io->u.user_principal_name	= samdb_result_string(searched_msg, "userPrincipalName", NULL);
+	io->u.sAMAccountName		= ldb_msg_find_attr_as_string(searched_msg,
+								      "sAMAccountName", NULL);
+	io->u.user_principal_name	= ldb_msg_find_attr_as_string(searched_msg,
+								      "userPrincipalName", NULL);
 	io->u.is_computer		= ldb_msg_check_string_attribute(searched_msg, "objectClass", "computer");
 
 	if (io->u.sAMAccountName == NULL) {
@@ -2091,11 +2094,16 @@ static int get_domain_data_callback(struct ldb_request *req,
 		}
 
 		/* Setup the "domain data" structure */
-		ac->status->domain_data.pwdProperties = samdb_result_uint(ares->message, "pwdProperties", -1);
-		ac->status->domain_data.pwdHistoryLength = samdb_result_uint(ares->message, "pwdHistoryLength", -1);
-		ac->status->domain_data.maxPwdAge = samdb_result_int64(ares->message, "maxPwdAge", -1);
-		ac->status->domain_data.minPwdAge = samdb_result_int64(ares->message, "minPwdAge", -1);
-		ac->status->domain_data.minPwdLength = samdb_result_uint(ares->message, "minPwdLength", -1);
+		ac->status->domain_data.pwdProperties =
+			ldb_msg_find_attr_as_uint(ares->message, "pwdProperties", -1);
+		ac->status->domain_data.pwdHistoryLength =
+			ldb_msg_find_attr_as_uint(ares->message, "pwdHistoryLength", -1);
+		ac->status->domain_data.maxPwdAge =
+			ldb_msg_find_attr_as_int64(ares->message, "maxPwdAge", -1);
+		ac->status->domain_data.minPwdAge =
+			ldb_msg_find_attr_as_int64(ares->message, "minPwdAge", -1);
+		ac->status->domain_data.minPwdLength =
+			ldb_msg_find_attr_as_uint(ares->message, "minPwdLength", -1);
 		ac->status->domain_data.store_cleartext =
 			ac->status->domain_data.pwdProperties & DOMAIN_PASSWORD_STORE_CLEARTEXT;
 
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 385be493b3..3f1dd49072 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -950,7 +950,7 @@ static int samldb_prim_group_set(struct samldb_ctx *ac)
 	uint32_t rid;
 	struct dom_sid *sid;
 
-	rid = samdb_result_uint(ac->msg, "primaryGroupID", (uint32_t) -1);
+	rid = ldb_msg_find_attr_as_uint(ac->msg, "primaryGroupID", (uint32_t) -1);
 	if (rid == (uint32_t) -1) {
 		/* we aren't affected of any primary group set */
 		return LDB_SUCCESS;
@@ -1000,7 +1000,7 @@ static int samldb_prim_group_change(struct samldb_ctx *ac)
 
 	/* Finds out the DN of the old primary group */
 
-	rid = samdb_result_uint(res->msgs[0], "primaryGroupID", (uint32_t) -1);
+	rid = ldb_msg_find_attr_as_uint(res->msgs[0], "primaryGroupID", (uint32_t) -1);
 	if (rid == (uint32_t) -1) {
 		/* User objects do always have a mandatory "primaryGroupID"
 		 * attribute. If this doesn't exist then the object is of the
@@ -1021,7 +1021,7 @@ static int samldb_prim_group_change(struct samldb_ctx *ac)
 
 	/* Finds out the DN of the new primary group */
 
-	rid = samdb_result_uint(ac->msg, "primaryGroupID", (uint32_t) -1);
+	rid = ldb_msg_find_attr_as_uint(ac->msg, "primaryGroupID", (uint32_t) -1);
 	if (rid == (uint32_t) -1) {
 		/* we aren't affected of any primary group change */
 		return LDB_SUCCESS;