diff options
| -rw-r--r-- | src/db/sysdb.h | 3 | ||||
| -rw-r--r-- | src/db/sysdb_subdomains.c | 21 | ||||
| -rw-r--r-- | src/providers/ad/ad_subdomains.c | 2 | ||||
| -rw-r--r-- | src/providers/ipa/ipa_subdomains.c | 2 |
4 files changed, 4 insertions, 24 deletions
diff --git a/src/db/sysdb.h b/src/db/sysdb.h index b91596c4..536cac7a 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -378,8 +378,7 @@ errno_t sysdb_update_subdomains(struct sss_domain_info *domain); errno_t sysdb_master_domain_update(struct sss_domain_info *domain); errno_t sysdb_master_domain_add_info(struct sss_domain_info *domain, - const char *realm, const char *flat, - const char *id); + const char *flat, const char *id); errno_t sysdb_subdomain_delete(struct sysdb_ctx *sysdb, const char *name); diff --git a/src/db/sysdb_subdomains.c b/src/db/sysdb_subdomains.c index c89e4569..0e7514ba 100644 --- a/src/db/sysdb_subdomains.c +++ b/src/db/sysdb_subdomains.c @@ -251,8 +251,7 @@ done: } errno_t sysdb_master_domain_add_info(struct sss_domain_info *domain, - const char *realm, const char *flat, - const char *id) + const char *flat, const char *id) { TALLOC_CTX *tmp_ctx; struct ldb_message *msg; @@ -277,24 +276,6 @@ errno_t sysdb_master_domain_add_info(struct sss_domain_info *domain, goto done; } - if (realm != NULL && (domain->realm == NULL || - strcmp(domain->realm, realm) != 0)) { - ret = ldb_msg_add_empty(msg, SYSDB_SUBDOMAIN_REALM, - LDB_FLAG_MOD_REPLACE, NULL); - if (ret != LDB_SUCCESS) { - ret = sysdb_error_to_errno(ret); - goto done; - } - - ret = ldb_msg_add_string(msg, SYSDB_SUBDOMAIN_REALM, realm); - if (ret != LDB_SUCCESS) { - ret = sysdb_error_to_errno(ret); - goto done; - } - - do_update = true; - } - if (flat != NULL && (domain->flat_name == NULL || strcmp(domain->flat_name, flat) != 0)) { ret = ldb_msg_add_empty(msg, SYSDB_SUBDOMAIN_FLAT, diff --git a/src/providers/ad/ad_subdomains.c b/src/providers/ad/ad_subdomains.c index be4781cc..0eebd4d9 100644 --- a/src/providers/ad/ad_subdomains.c +++ b/src/providers/ad/ad_subdomains.c @@ -569,7 +569,7 @@ static void ad_subdomains_get_netlogon_done(struct tevent_req *req) DEBUG(SSSDBG_TRACE_FUNC, ("Found flat name [%s].\n", ctx->flat_name)); ret = sysdb_master_domain_add_info(ctx->sd_ctx->be_ctx->domain, - NULL, ctx->flat_name, ctx->master_sid); + ctx->flat_name, ctx->master_sid); ret = ad_subdomains_get_slave(ctx); if (ret == EAGAIN) { diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c index 6e627c93..cb0d567b 100644 --- a/src/providers/ipa/ipa_subdomains.c +++ b/src/providers/ipa/ipa_subdomains.c @@ -918,7 +918,7 @@ static void ipa_subdomains_handler_master_done(struct tevent_req *req) } ret = sysdb_master_domain_add_info(ctx->sd_ctx->be_ctx->domain, - NULL, flat, id); + flat, id); } else { ctx->search_base_iter++; ret = ipa_subdomains_handler_get(ctx, IPA_SUBDOMAINS_MASTER); |