diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-10-14 09:41:42 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-10-15 08:36:01 +1100 |
| commit | a0e9814c0d50ee822188e2bd6be8c4879aaebacc (patch) | |
| tree | 79670d9c58f88ae6007b17ab240a1e64ed33c05e /source4/rpc_server/netlogon | |
| parent | c2533f94b561e9b22d621b7515c6606d39ffec89 (diff) | |
| download | samba-a0e9814c0d50ee822188e2bd6be8c4879aaebacc.tar.gz samba-a0e9814c0d50ee822188e2bd6be8c4879aaebacc.tar.bz2 samba-a0e9814c0d50ee822188e2bd6be8c4879aaebacc.zip | |
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>
Diffstat (limited to 'source4/rpc_server/netlogon')
| -rw-r--r-- | source4/rpc_server/netlogon/dcerpc_netlogon.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 0ddd098897..b4fe5dca88 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -1240,8 +1240,8 @@ static NTSTATUS fill_one_domain_info(TALLOC_CTX *mem_ctx, info->domain_guid = samdb_result_guid(res, "objectGUID"); info->domain_sid = samdb_result_dom_sid(mem_ctx, res, "objectSid"); } else { - info->domainname.string = samdb_result_string(res, "flatName", NULL); - info->dns_domainname.string = samdb_result_string(res, "trustPartner", NULL); + info->domainname.string = ldb_msg_find_attr_as_string(res, "flatName", NULL); + info->dns_domainname.string = ldb_msg_find_attr_as_string(res, "trustPartner", NULL); info->domain_guid = samdb_result_guid(res, "objectGUID"); info->domain_sid = samdb_result_dom_sid(mem_ctx, res, "securityIdentifier"); } @@ -1335,7 +1335,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal } /* Gets the old DNS hostname */ - old_dns_hostname = samdb_result_string(res1[0], "dNSHostName", + old_dns_hostname = ldb_msg_find_attr_as_string(res1[0], "dNSHostName", NULL); /* @@ -1472,7 +1472,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal NT_STATUS_NOT_OK_RETURN(status); /* Sets the supported encryption types */ - domain_info->supported_enc_types = samdb_result_uint(res1[0], + domain_info->supported_enc_types = ldb_msg_find_attr_as_uint(res1[0], "msDS-SupportedEncryptionTypes", default_supported_enc_types); @@ -1848,7 +1848,7 @@ static WERROR dcesrv_netr_DsrGetDcSiteCoverageW(struct dcesrv_call_state *dce_ca #define GET_CHECK_STR(dest, mem, msg, attr) \ do {\ const char *s; \ - s = samdb_result_string(msg, attr, NULL); \ + s = ldb_msg_find_attr_as_string(msg, attr, NULL); \ if (!s) { \ DEBUG(0, ("DB Error, TustedDomain entry (%s) " \ "without flatname\n", \ @@ -1894,8 +1894,8 @@ static WERROR fill_trusted_domains_array(TALLOC_CTX *mem_ctx, unsigned int trust_dir; uint32_t flags = 0; - trust_dir = samdb_result_uint(dom_res[i], - "trustDirection", 0); + trust_dir = ldb_msg_find_attr_as_uint(dom_res[i], + "trustDirection", 0); if (trust_dir & LSA_TRUST_DIRECTION_INBOUND) { flags |= NETR_TRUST_FLAG_INBOUND; @@ -1928,10 +1928,10 @@ static WERROR fill_trusted_domains_array(TALLOC_CTX *mem_ctx, } trusts->array[n].trust_type = - samdb_result_uint(dom_res[i], + ldb_msg_find_attr_as_uint(dom_res[i], "trustType", 0); trusts->array[n].trust_attributes = - samdb_result_uint(dom_res[i], + ldb_msg_find_attr_as_uint(dom_res[i], "trustAttributes", 0); if ((trusts->array[n].trust_type == NETR_TRUST_TYPE_MIT) || |