Hi! Attached is patch for ticket: https://fedorahosted.org/sssd/ticket/3086
This patch applies on top of the patches from thread: [SSSD] [PATCH] sssctl: Consistent commands naming Michal
>From c7d59835f5d05d6972e29f0d0bc974bd00155189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzi...@redhat.com> Date: Tue, 26 Jul 2016 16:35:55 +0200 Subject: [PATCH] sssctl: Generic help for cache-upgrade and config-check Fixes: https://fedorahosted.org/sssd/ticket/3086 sssctl COMMAND --help should print at least generic help, even if the command does not accept any command specific options. --- src/tools/sssctl/sssctl_config.c | 11 +++++++++++ src/tools/sssctl/sssctl_data.c | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/tools/sssctl/sssctl_config.c b/src/tools/sssctl/sssctl_config.c index a66d774..05054bc 100644 --- a/src/tools/sssctl/sssctl_config.c +++ b/src/tools/sssctl/sssctl_config.c @@ -47,6 +47,17 @@ errno_t sssctl_config_check(struct sss_cmdline *cmdline, char **strs = NULL; TALLOC_CTX *tmp_ctx = NULL; + /* Parse command line. */ + struct poptOption options[] = { + POPT_TABLEEND + }; + + ret = sss_tool_popt(cmdline, options, 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 7a0f1b2..c4f09fd 100644 --- a/src/tools/sssctl/sssctl_data.c +++ b/src/tools/sssctl/sssctl_data.c @@ -266,6 +266,17 @@ errno_t sssctl_cache_upgrade(struct sss_cmdline *cmdline, struct sysdb_upgrade_ctx db_up_ctx; errno_t ret; + /* Parse command line. */ + struct poptOption options[] = { + POPT_TABLEEND + }; + + ret = sss_tool_popt(cmdline, options, 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; } -- 2.5.0
_______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
