summaryrefslogtreecommitdiffstats
path: root/src/confdb
diff options
context:
space:
mode:
authorMichal Židek <mzidek@redhat.com>2016-06-22 19:11:42 +0200
committerJakub Hrozek <jhrozek@redhat.com>2016-06-27 22:25:27 +0200
commit8b2a31634764168183506925a4b9f461afdba6f3 (patch)
treee2c922c85a073f28db47e77daea84fd4cb558b17 /src/confdb
parentcca497b4cbbbf05c4f9181b7d8113cde81754831 (diff)
downloadsssd-8b2a31634764168183506925a4b9f461afdba6f3.tar.gz
sssd-8b2a31634764168183506925a4b9f461afdba6f3.tar.xz
sssd-8b2a31634764168183506925a4b9f461afdba6f3.zip
confdb: Check for config file errors on sssd startup
Resolves: https://fedorahosted.org/sssd/ticket/2028 Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com> Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com> Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Diffstat (limited to 'src/confdb')
-rw-r--r--src/confdb/confdb.c2
-rw-r--r--src/confdb/confdb.h2
-rw-r--r--src/confdb/confdb_setup.c9
3 files changed, 10 insertions, 3 deletions
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 <ssorce@redhat.com> 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 <ssorce@redhat.com> 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) {