URL: https://github.com/SSSD/sssd/pull/196 Author: mzidek-rh Title: #196: SSSD-1.15 - config-check: Message when sssd.conf is missing Action: synchronized
To pull the PR as Git branch: git remote add ghsssd https://github.com/SSSD/sssd git fetch ghsssd pull/196/head:pr196 git checkout pr196
From c55f0a898c0f97d2886defb8b78bcd4c540f4683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzi...@redhat.com> Date: Tue, 14 Mar 2017 15:43:41 +0100 Subject: [PATCH 1/2] config-check: Message when sssd.conf is missing sssctl config-check should print a message for user if no sssd.conf was found. Resolves: https://pagure.io/SSSD/sssd/issue/3330 --- src/tools/sssctl/sssctl_config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tools/sssctl/sssctl_config.c b/src/tools/sssctl/sssctl_config.c index 630df3c..7e3ebf5 100644 --- a/src/tools/sssctl/sssctl_config.c +++ b/src/tools/sssctl/sssctl_config.c @@ -63,7 +63,10 @@ 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 != EOK) { + if (ret == ENOENT) { + ERROR("File %1$s does not exist.\n", SSSD_CONFIG_FILE); + goto done; + } else if (ret != EOK) { DEBUG(SSSDBG_TRACE_FUNC, "sss_ini_config_file_open failed: %s [%d]\n", sss_strerror(ret), From 99c3000c4f458eb1e81f5c2e672d2089737bf896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzi...@redhat.com> Date: Wed, 15 Mar 2017 15:48:24 +0100 Subject: [PATCH 2/2] sssctl: config-check on no sssd.conf Print different message when SSSD was configured with --enable-files-domain. Resolves: https://pagure.io/SSSD/sssd/issue/3330 --- src/tools/sssctl/sssctl_config.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/tools/sssctl/sssctl_config.c b/src/tools/sssctl/sssctl_config.c index 7e3ebf5..eb50d1e 100644 --- a/src/tools/sssctl/sssctl_config.c +++ b/src/tools/sssctl/sssctl_config.c @@ -64,7 +64,13 @@ 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) { +#ifdef ADD_FILES_DOMAIN + PRINT("File %1$s does not exist. SSSD will use default " + "configuration with files provider.\n", SSSD_CONFIG_FILE); + ret = EOK; +#else ERROR("File %1$s does not exist.\n", SSSD_CONFIG_FILE); +#endif /* ADD_FILES_DOMAIN */ goto done; } else if (ret != EOK) { DEBUG(SSSDBG_TRACE_FUNC,
_______________________________________________ sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org
