diff options
| -rw-r--r-- | source4/dsdb/repl/drepl_partitions.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c index 7464dc1554..5949f42d06 100644 --- a/source4/dsdb/repl/drepl_partitions.c +++ b/source4/dsdb/repl/drepl_partitions.c @@ -128,32 +128,16 @@ WERROR dreplsrv_load_partitions(struct dreplsrv_service *s) /* Check if particular SPN exists for an account */ -static bool dreplsrv_spn_exists(struct ldb_context *samdb, struct ldb_dn *ntds_dn, +static bool dreplsrv_spn_exists(struct ldb_context *samdb, struct ldb_dn *account_dn, const char *principal_name) { TALLOC_CTX *tmp_ctx; - const char *attrs[] = { "serverReference", NULL }; const char *attrs_empty[] = { NULL }; int ret; struct ldb_result *res; - struct ldb_dn *account_dn; tmp_ctx = talloc_new(samdb); - ret = dsdb_search_dn(samdb, tmp_ctx, &res, ntds_dn, attrs, 0); - if (ret != LDB_SUCCESS) { - talloc_free(tmp_ctx); - return false; - } - - account_dn = ldb_msg_find_attr_as_dn(samdb, tmp_ctx, res->msgs[0], "serverReference"); - if (account_dn == NULL) { - talloc_free(tmp_ctx); - return false; - } - - talloc_free(res); - ret = dsdb_search(samdb, tmp_ctx, &res, account_dn, LDB_SCOPE_BASE, attrs_empty, 0, "servicePrincipalName=%s", ldb_binary_encode_string(tmp_ctx, principal_name)); @@ -176,11 +160,11 @@ NTSTATUS dreplsrv_get_target_principal(struct dreplsrv_service *s, { TALLOC_CTX *tmp_ctx; struct ldb_result *res; - const char *attrs_server[] = { "dNSHostName", NULL }; + const char *attrs_server[] = { "dNSHostName", "serverReference", NULL }; const char *attrs_ntds[] = { "msDS-HasDomainNCs", "hasMasterNCs", NULL }; int ret; const char *hostname, *dnsdomain=NULL; - struct ldb_dn *ntds_dn, *server_dn; + struct ldb_dn *ntds_dn, *server_dn, *computer_dn; struct ldb_dn *forest_dn, *nc_dn; *target_principal = NULL; @@ -221,7 +205,8 @@ NTSTATUS dreplsrv_get_target_principal(struct dreplsrv_service *s, } hostname = ldb_msg_find_attr_as_string(res->msgs[0], "dNSHostName", NULL); - if (hostname != NULL) { + computer_dn = ldb_msg_find_attr_as_dn(s->samdb, tmp_ctx, res->msgs[0], "serverReference"); + if (hostname != NULL && computer_dn != NULL) { char *local_principal; /* @@ -234,7 +219,7 @@ NTSTATUS dreplsrv_get_target_principal(struct dreplsrv_service *s, local_principal = talloc_asprintf(mem_ctx, "GC/%s/%s", hostname, samdb_dn_to_dns_domain(tmp_ctx, forest_dn)); - if (dreplsrv_spn_exists(s->samdb, ntds_dn, local_principal)) { + if (dreplsrv_spn_exists(s->samdb, computer_dn, local_principal)) { *target_principal = local_principal; talloc_free(tmp_ctx); return NT_STATUS_OK; |