diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2017-04-05 14:04:46 +0200 |
|---|---|---|
| committer | Lukas Slebodnik <lslebodn@redhat.com> | 2017-04-10 14:44:00 +0200 |
| commit | 3509bb03ecef49264820c9e287e8b2c7e0a8a508 (patch) | |
| tree | fbcb66f126aa9042d72b5323cd7951b92c013c3f | |
| parent | 6a611406e805a1707ca0b9e86b6aa96e02e43ecc (diff) | |
| download | sssd-3509bb03ecef49264820c9e287e8b2c7e0a8a508.tar.gz sssd-3509bb03ecef49264820c9e287e8b2c7e0a8a508.tar.xz sssd-3509bb03ecef49264820c9e287e8b2c7e0a8a508.zip | |
CONFDB: Fix handling of enable_files_domain
The option enable_files_domain worked only if sssd
was compiled with --enable-files-domain. But manual page described
something else.
Resolves:
https://pagure.io/SSSD/sssd/issue/3340
Reviewed-by: Michal Židek <mzidek@redhat.com>
| -rw-r--r-- | src/confdb/confdb.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c index 88e114457..68693e838 100644 --- a/src/confdb/confdb.c +++ b/src/confdb/confdb.c @@ -1695,7 +1695,6 @@ done: return ret; } -#ifdef ADD_FILES_DOMAIN static int confdb_has_files_domain(struct confdb_ctx *cdb) { TALLOC_CTX *tmp_ctx = NULL; @@ -1830,25 +1829,27 @@ done: talloc_free(tmp_ctx); return ret; } -#endif /* ADD_FILES_DOMAIN */ int confdb_ensure_files_domain(struct confdb_ctx *cdb, const char *implicit_files_dom_name) { -#ifndef ADD_FILES_DOMAIN - return EOK; +#ifdef ADD_FILES_DOMAIN + const bool default_enable_files = true; #else + const bool default_enable_files = false; +#endif errno_t ret; bool enable_files; ret = confdb_get_bool(cdb, CONFDB_MONITOR_CONF_ENTRY, CONFDB_MONITOR_ENABLE_FILES_DOM, - true, &enable_files); + default_enable_files, &enable_files); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - "Cannot get the value of %s assuming true\n", - CONFDB_MONITOR_ENABLE_FILES_DOM); + "Cannot get the value of %s assuming %s\n", + CONFDB_MONITOR_ENABLE_FILES_DOM, + default_enable_files ? "true" : "false"); return ret; } @@ -1874,7 +1875,6 @@ int confdb_ensure_files_domain(struct confdb_ctx *cdb, } return activate_files_domain(cdb, implicit_files_dom_name); -#endif /* ADD_FILES_DOMAIN */ } static int confdb_get_parent_domain(TALLOC_CTX *mem_ctx, |