sss_tools: add command description

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>

3 files changed, 22 insertions, 14 deletions

diff --git a/src/tools/common/sss_tools.c b/src/tools/common/sss_tools.c
index b916f772b..a3280066f 100644
--- a/src/tools/common/sss_tools.c
+++ b/src/tools/common/sss_tools.c
@@ -228,7 +228,12 @@ int sss_tool_usage(const char *tool_name,
     fprintf(stderr, _("Available commands:\n"));
 
     for (i = 0; commands[i].command != NULL; i++) {
-        fprintf(stderr, "* %s\n", commands[i].command);
+        if (commands[i].description == NULL) {
+            fprintf(stderr, "* %s\n", commands[i].command);
+        } else {
+            fprintf(stderr, "* %s\t\t %s\n",
+                    commands[i].command, commands[i].description);
+        }
     }
 
     fprintf(stderr, _("\n"));
diff --git a/src/tools/common/sss_tools.h b/src/tools/common/sss_tools.h
index cfe11d06e..77a964512 100644
--- a/src/tools/common/sss_tools.h
+++ b/src/tools/common/sss_tools.h
@@ -43,8 +43,11 @@ typedef int
                 struct sss_tool_ctx *tool_ctx,
                 void *pvt);
 
+#define SSS_TOOL_COMMAND(cmd, msg, fn) {cmd, _(msg), fn}
+
 struct sss_route_cmd {
     const char *command;
+    const char *description;
     sss_route_fn fn;
 };
 
diff --git a/src/tools/sss_override.c b/src/tools/sss_override.c
index f911ce880..572cdf899 100644
--- a/src/tools/sss_override.c
+++ b/src/tools/sss_override.c
@@ -1905,19 +1905,19 @@ static int override_group_export(struct sss_cmdline *cmdline,
 int main(int argc, const char **argv)
 {
     struct sss_route_cmd commands[] = {
-        {"user-add", override_user_add},
-        {"user-del", override_user_del},
-        {"user-find", override_user_find},
-        {"user-show", override_user_show},
-        {"user-import", override_user_import},
-        {"user-export", override_user_export},
-        {"group-add", override_group_add},
-        {"group-del", override_group_del},
-        {"group-find", override_group_find},
-        {"group-show", override_group_show},
-        {"group-import", override_group_import},
-        {"group-export", override_group_export},
-        {NULL, NULL}
+        {"user-add", NULL, override_user_add},
+        {"user-del", NULL, override_user_del},
+        {"user-find", NULL, override_user_find},
+        {"user-show", NULL, override_user_show},
+        {"user-import", NULL, override_user_import},
+        {"user-export", NULL, override_user_export},
+        {"group-add", NULL, override_group_add},
+        {"group-del", NULL, override_group_del},
+        {"group-find", NULL, override_group_find},
+        {"group-show", NULL, override_group_show},
+        {"group-import", NULL, override_group_import},
+        {"group-export", NULL, override_group_export},
+        {NULL, NULL, NULL}
     };
 
     return sss_tool_main(argc, argv, commands, NULL);