From 3509bb03ecef49264820c9e287e8b2c7e0a8a508 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 5 Apr 2017 14:04:46 +0200 Subject: [PATCH 100/135] CONFDB: Fix handling of enable_files_domain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/confdb/confdb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c index 88e114457deac3ca50c291a131122624fb6f6fe4..68693e8382c0fbf1015ee47f14fa7c6f64ae98b2 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, -- 2.12.2