From 8b2a31634764168183506925a4b9f461afdba6f3 Mon Sep 17 00:00:00 2001 From: Michal Židek Date: Wed, 22 Jun 2016 19:11:42 +0200 Subject: confdb: Check for config file errors on sssd startup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: https://fedorahosted.org/sssd/ticket/2028 Signed-off-by: Lukas Slebodnik Reviewed-by: Lukáš Slebodník Reviewed-by: Jakub Hrozek --- src/confdb/confdb.c | 2 +- src/confdb/confdb.h | 2 +- src/confdb/confdb_setup.c | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/confdb') diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c index d40934489..b99c6cf40 100644 --- a/src/confdb/confdb.c +++ b/src/confdb/confdb.c @@ -1,7 +1,7 @@ /* SSSD - NSS Configuratoin DB + SSSD Configuration DB Copyright (C) Simo Sorce 2008 diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h index 2cd75b9e8..eb5764c2e 100644 --- a/src/confdb/confdb.h +++ b/src/confdb/confdb.h @@ -1,7 +1,7 @@ /* SSSD - NSS Configuratoin DB + SSSD Configuration DB Copyright (C) Simo Sorce 2008 diff --git a/src/confdb/confdb_setup.c b/src/confdb/confdb_setup.c index 1e4b9a269..614aa2206 100644 --- a/src/confdb/confdb_setup.c +++ b/src/confdb/confdb_setup.c @@ -141,7 +141,6 @@ static int confdb_init_db(const char *config_file, const char *config_dir, struct ldb_ldif *ldif; struct sss_ini_initdata *init_data; - tmp_ctx = talloc_new(cdb); if (tmp_ctx == NULL) { DEBUG(SSSDBG_FATAL_FAILURE, "Out of memory.\n"); @@ -234,6 +233,14 @@ static int confdb_init_db(const char *config_file, const char *config_dir, goto done; } + /* FIXME: Do not hardcode the path */ + ret = sss_ini_call_validators(init_data, + "/var/lib/sss/cfg_rules.ini"); + if (ret != EOK) { + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to call validators\n"); + /* This is not fatal, continue */ + } + /* Make sure that the config file version matches the confdb version */ ret = sss_ini_get_cfgobj(init_data, "sssd", "config_file_version"); if (ret != EOK) { -- cgit