]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
dsdb/util_trusts: domain_dn is an input parameter of dsdb_trust_crossref_tdo_info()
authorStefan Metzmacher <metze@samba.org>
Thu, 1 Feb 2018 22:08:08 +0000 (23:08 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 5 Sep 2018 11:35:24 +0000 (13:35 +0200)
We should not overwrite it within the function.
Currently it doesn't matter as we don't have multiple domains
within our forest, but that will change in future.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11517

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit f5f96f558b499770cdeb3d38998167a387e058b9)

source4/dsdb/common/util_trusts.c

index a083d869f6eb83c9995e1427faa87259fba495a8..bb34aa1054beb01351954809771e59b188a72354 100644 (file)
@@ -481,12 +481,6 @@ static NTSTATUS dsdb_trust_crossref_tdo_info(TALLOC_CTX *mem_ctx,
                *_trust_parent_tdo = NULL;
        }
 
-       domain_dn = ldb_get_default_basedn(sam_ctx);
-       if (domain_dn == NULL) {
-               TALLOC_FREE(frame);
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
        partitions_dn = samdb_partitions_dn(sam_ctx, frame);
        if (partitions_dn == NULL) {
                TALLOC_FREE(frame);