From: Stefan Metzmacher Date: Tue, 5 Jun 2018 00:53:53 +0000 (+0200) Subject: dsdb:util_trusts: remove unused dsdb_trust_forest_info_{from,to}_lsa() X-Git-Tag: tevent-0.17.0~715 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2fc827b64b3c2f9c169304e012cb67f96bb36c3;p=thirdparty%2Fsamba.git dsdb:util_trusts: remove unused dsdb_trust_forest_info_{from,to}_lsa() Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme --- diff --git a/source4/dsdb/common/util_trusts.c b/source4/dsdb/common/util_trusts.c index 3d38a607771..77fe8fe95e7 100644 --- a/source4/dsdb/common/util_trusts.c +++ b/source4/dsdb/common/util_trusts.c @@ -39,235 +39,6 @@ #undef strcasecmp -NTSTATUS dsdb_trust_forest_info_from_lsa(TALLOC_CTX *mem_ctx, - const struct lsa_ForestTrustInformation *lfti, - struct ForestTrustInfo **_fti) -{ - struct ForestTrustInfo *fti; - uint32_t i; - - *_fti = NULL; - - fti = talloc_zero(mem_ctx, struct ForestTrustInfo); - if (fti == NULL) { - return NT_STATUS_NO_MEMORY; - } - - fti->version = 1; - fti->count = lfti->count; - fti->records = talloc_zero_array(mem_ctx, - struct ForestTrustInfoRecordArmor, - fti->count); - if (fti->records == NULL) { - TALLOC_FREE(fti); - return NT_STATUS_NO_MEMORY; - } - - for (i = 0; i < fti->count; i++) { - const struct lsa_ForestTrustRecord *lftr = lfti->entries[i]; - struct ForestTrustInfoRecord *ftr = &fti->records[i].record; - struct ForestTrustString *str = NULL; - const struct lsa_StringLarge *lstr = NULL; - const struct lsa_ForestTrustDomainInfo *linfo = NULL; - struct ForestTrustDataDomainInfo *info = NULL; - - if (lftr == NULL) { - TALLOC_FREE(fti); - return NT_STATUS_INVALID_PARAMETER; - } - - ftr->flags = lftr->flags; - ftr->timestamp = lftr->time; - ftr->type = (enum ForestTrustInfoRecordType)lftr->type; - - switch (lftr->type) { - case LSA_FOREST_TRUST_TOP_LEVEL_NAME: - lstr = &lftr->forest_trust_data.top_level_name; - str = &ftr->data.name; - - str->string = talloc_strdup(mem_ctx, lstr->string); - if (str->string == NULL) { - TALLOC_FREE(fti); - return NT_STATUS_NO_MEMORY; - } - - break; - - case LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX: - lstr = &lftr->forest_trust_data.top_level_name_ex; - str = &ftr->data.name; - - str->string = talloc_strdup(mem_ctx, lstr->string); - if (str->string == NULL) { - TALLOC_FREE(fti); - return NT_STATUS_NO_MEMORY; - } - - break; - - case LSA_FOREST_TRUST_DOMAIN_INFO: - linfo = &lftr->forest_trust_data.domain_info; - info = &ftr->data.info; - - if (linfo->domain_sid == NULL) { - TALLOC_FREE(fti); - return NT_STATUS_INVALID_PARAMETER; - } - info->sid = *linfo->domain_sid; - - lstr = &linfo->dns_domain_name; - str = &info->dns_name; - str->string = talloc_strdup(mem_ctx, lstr->string); - if (str->string == NULL) { - TALLOC_FREE(fti); - return NT_STATUS_NO_MEMORY; - } - - lstr = &linfo->netbios_domain_name; - str = &info->netbios_name; - str->string = talloc_strdup(mem_ctx, lstr->string); - if (str->string == NULL) { - TALLOC_FREE(fti); - return NT_STATUS_NO_MEMORY; - } - - break; - - default: - return NT_STATUS_NOT_SUPPORTED; - } - } - - *_fti = fti; - return NT_STATUS_OK; -} - -static NTSTATUS dsdb_trust_forest_record_to_lsa(TALLOC_CTX *mem_ctx, - const struct ForestTrustInfoRecord *ftr, - struct lsa_ForestTrustRecord **_lftr) -{ - struct lsa_ForestTrustRecord *lftr = NULL; - const struct ForestTrustString *str = NULL; - struct lsa_StringLarge *lstr = NULL; - const struct ForestTrustDataDomainInfo *info = NULL; - struct lsa_ForestTrustDomainInfo *linfo = NULL; - - *_lftr = NULL; - - lftr = talloc_zero(mem_ctx, struct lsa_ForestTrustRecord); - if (lftr == NULL) { - return NT_STATUS_NO_MEMORY; - } - - lftr->flags = ftr->flags; - lftr->time = ftr->timestamp; - lftr->type = (enum lsa_ForestTrustRecordType)ftr->type; - - switch (lftr->type) { - case LSA_FOREST_TRUST_TOP_LEVEL_NAME: - lstr = &lftr->forest_trust_data.top_level_name; - str = &ftr->data.name; - - lstr->string = talloc_strdup(mem_ctx, str->string); - if (lstr->string == NULL) { - TALLOC_FREE(lftr); - return NT_STATUS_NO_MEMORY; - } - - break; - - case LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX: - lstr = &lftr->forest_trust_data.top_level_name_ex; - str = &ftr->data.name; - - lstr->string = talloc_strdup(mem_ctx, str->string); - if (lstr->string == NULL) { - TALLOC_FREE(lftr); - return NT_STATUS_NO_MEMORY; - } - - break; - - case LSA_FOREST_TRUST_DOMAIN_INFO: - linfo = &lftr->forest_trust_data.domain_info; - info = &ftr->data.info; - - linfo->domain_sid = dom_sid_dup(lftr, &info->sid); - if (linfo->domain_sid == NULL) { - TALLOC_FREE(lftr); - return NT_STATUS_NO_MEMORY; - } - - lstr = &linfo->dns_domain_name; - str = &info->dns_name; - lstr->string = talloc_strdup(mem_ctx, str->string); - if (lstr->string == NULL) { - TALLOC_FREE(lftr); - return NT_STATUS_NO_MEMORY; - } - - lstr = &linfo->netbios_domain_name; - str = &info->netbios_name; - lstr->string = talloc_strdup(mem_ctx, str->string); - if (lstr->string == NULL) { - TALLOC_FREE(lftr); - return NT_STATUS_NO_MEMORY; - } - - break; - - default: - return NT_STATUS_NOT_SUPPORTED; - } - - *_lftr = lftr; - return NT_STATUS_OK; -} - -NTSTATUS dsdb_trust_forest_info_to_lsa(TALLOC_CTX *mem_ctx, - const struct ForestTrustInfo *fti, - struct lsa_ForestTrustInformation **_lfti) -{ - struct lsa_ForestTrustInformation *lfti; - uint32_t i; - - *_lfti = NULL; - - if (fti->version != 1) { - return NT_STATUS_INVALID_PARAMETER; - } - - lfti = talloc_zero(mem_ctx, struct lsa_ForestTrustInformation); - if (lfti == NULL) { - return NT_STATUS_NO_MEMORY; - } - - lfti->count = fti->count; - lfti->entries = talloc_zero_array(mem_ctx, - struct lsa_ForestTrustRecord *, - lfti->count); - if (lfti->entries == NULL) { - TALLOC_FREE(lfti); - return NT_STATUS_NO_MEMORY; - } - - for (i = 0; i < fti->count; i++) { - struct ForestTrustInfoRecord *ftr = &fti->records[i].record; - struct lsa_ForestTrustRecord *lftr = NULL; - NTSTATUS status; - - status = dsdb_trust_forest_record_to_lsa(lfti->entries, ftr, - &lftr); - if (!NT_STATUS_IS_OK(status)) { - TALLOC_FREE(lfti); - return NT_STATUS_NO_MEMORY; - } - lfti->entries[i] = lftr; - } - - *_lfti = lfti; - return NT_STATUS_OK; -} static NTSTATUS dsdb_trust_forest_info_add_record(struct lsa_ForestTrustInformation *fti, const struct lsa_ForestTrustRecord *ftr)