Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CONFDB: don't hard fail in add_implicit_services()
Browse files Browse the repository at this point in the history
if no explicitly configured domains found.

There are might be 'enable_files_domain = true' or app domains that
are expanded later.
alexey-tikhonov committed Oct 9, 2024
1 parent 47b9cc1 commit aef1c57
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/confdb/confdb.c
Original file line number Diff line number Diff line change
@@ -662,7 +662,8 @@ static errno_t add_implicit_services(struct confdb_ctx *cdb, TALLOC_CTX *mem_ctx

ret = confdb_get_enabled_domain_list(cdb, tmp_ctx, &domain_names);
if (ret == ENOENT) {
DEBUG(SSSDBG_OP_FAILURE, "No domains configured!\n");
/* confdb_expand_app_domains() wasn't called yet, so this might be ok */
ret = EOK;
goto done;
} else if (ret != EOK) {
DEBUG(SSSDBG_FATAL_FAILURE, "Error retrieving domains list [%d]: %s\n",
5 changes: 4 additions & 1 deletion src/monitor/monitor.c
Original file line number Diff line number Diff line change
@@ -2056,7 +2056,10 @@ int main(int argc, const char *argv[])
}

monitor->cdb = main_ctx->confdb_ctx;
get_monitor_config(monitor);
ret = get_monitor_config(monitor);
if (ret = EOK) {
ret = 1;
}
monitor->is_daemon = !opt_interactive;
monitor->parent_pid = main_ctx->parent_pid;
monitor->ev = main_ctx->event_ctx;

0 comments on commit aef1c57

Please sign in to comment.