diff options
| author | Michal Židek <mzidek@redhat.com> | 2016-07-26 16:35:55 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2016-08-09 10:40:07 +0200 |
| commit | 55857e924977dbc66958f8033c6b38d6262ee631 (patch) | |
| tree | 9595242c22bf8a54228ac826897b4e2750a00e70 /src/tools | |
| parent | a16e7a370d0b564a5edad7791d2421d175c0787a (diff) | |
| download | sssd-55857e924977dbc66958f8033c6b38d6262ee631.tar.gz sssd-55857e924977dbc66958f8033c6b38d6262ee631.tar.xz sssd-55857e924977dbc66958f8033c6b38d6262ee631.zip | |
sssctl: Generic help for cache-upgrade and config-check
sssctl COMMAND --help should print at least
generic help, even if the command does not
accept any command specific options.
Resolves:
https://fedorahosted.org/sssd/ticket/3086
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/sssctl/sssctl_config.c | 6 | ||||
| -rw-r--r-- | src/tools/sssctl/sssctl_data.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/tools/sssctl/sssctl_config.c b/src/tools/sssctl/sssctl_config.c index a66d7749c..630df3c8f 100644 --- a/src/tools/sssctl/sssctl_config.c +++ b/src/tools/sssctl/sssctl_config.c @@ -47,6 +47,12 @@ errno_t sssctl_config_check(struct sss_cmdline *cmdline, char **strs = NULL; TALLOC_CTX *tmp_ctx = NULL; + ret = sss_tool_popt(cmdline, NULL, SSS_TOOL_OPT_OPTIONAL, NULL, NULL); + if (ret != EOK) { + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to parse command arguments\n"); + return ret; + } + tmp_ctx = talloc_new(NULL); init_data = sss_ini_initdata_init(tmp_ctx); if (!init_data) { diff --git a/src/tools/sssctl/sssctl_data.c b/src/tools/sssctl/sssctl_data.c index a26ddd8d5..72823ab25 100644 --- a/src/tools/sssctl/sssctl_data.c +++ b/src/tools/sssctl/sssctl_data.c @@ -266,6 +266,12 @@ errno_t sssctl_cache_upgrade(struct sss_cmdline *cmdline, struct sysdb_upgrade_ctx db_up_ctx; errno_t ret; + ret = sss_tool_popt(cmdline, NULL, SSS_TOOL_OPT_OPTIONAL, NULL, NULL); + if (ret != EOK) { + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to parse command arguments\n"); + return ret; + } + if (sss_deamon_running()) { return ERR_SSSD_RUNNING; } |