diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2017-04-29 19:11:31 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2017-05-23 11:36:22 +0200 |
| commit | 87de1e0fb0f1b40bc088540f7a24f0a20fecf618 (patch) | |
| tree | c81cd4508ea898e6db79d3a887517377c9164b86 | |
| parent | 29d063505c07127f7747405b1a61d8f782673645 (diff) | |
| download | sssd-87de1e0fb0f1b40bc088540f7a24f0a20fecf618.tar.gz sssd-87de1e0fb0f1b40bc088540f7a24f0a20fecf618.tar.xz sssd-87de1e0fb0f1b40bc088540f7a24f0a20fecf618.zip | |
CONFDB: Use default configuration with missing sssd.conf
Resolves:
https://pagure.io/SSSD/sssd/issue/3339
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
| -rw-r--r-- | src/confdb/confdb_setup.c | 5 | ||||
| -rw-r--r-- | src/tools/sssctl/sssctl_config.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/confdb/confdb_setup.c b/src/confdb/confdb_setup.c index 7884eea63..ed08f0e2f 100644 --- a/src/confdb/confdb_setup.c +++ b/src/confdb/confdb_setup.c @@ -34,6 +34,7 @@ "version: 2\n\n" \ "dn: cn=sssd,cn=config\n" \ "cn: sssd\n" \ +"enable_files_domain: true\n" \ "services: nss\n\n" #endif /* SSSD_FALLBACK_CONFIG_LDIF */ @@ -239,9 +240,6 @@ static int confdb_fallback_ldif(TALLOC_CTX *mem_ctx, const char **_timestr, const char **_ldif) { -#ifndef ADD_FILES_DOMAIN - return ERR_MISSING_CONF; -#else *_timestr = talloc_strdup(mem_ctx, "1"); *_ldif = talloc_strdup(mem_ctx, SSSD_FALLBACK_CONFIG_LDIF); if (*_timestr == NULL || *_ldif == NULL) { @@ -249,7 +247,6 @@ static int confdb_fallback_ldif(TALLOC_CTX *mem_ctx, } return EOK; -#endif } static int confdb_init_db(const char *config_file, const char *config_dir, diff --git a/src/tools/sssctl/sssctl_config.c b/src/tools/sssctl/sssctl_config.c index 7e3ebf542..ff382192a 100644 --- a/src/tools/sssctl/sssctl_config.c +++ b/src/tools/sssctl/sssctl_config.c @@ -64,8 +64,9 @@ errno_t sssctl_config_check(struct sss_cmdline *cmdline, /* Open config file */ ret = sss_ini_config_file_open(init_data, SSSD_CONFIG_FILE); if (ret == ENOENT) { - ERROR("File %1$s does not exist.\n", SSSD_CONFIG_FILE); - goto done; + PRINT("File %1$s does not exist. SSSD will use default " + "configuration with files provider.\n", SSSD_CONFIG_FILE); + ret = EOK; } else if (ret != EOK) { DEBUG(SSSDBG_TRACE_FUNC, "sss_ini_config_file_open failed: %s [%d]\n", |