From 6f36e763802e35ff2c431e67be20664e221de85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=BDidek?= Date: Mon, 25 Jul 2016 13:50:13 +0200 Subject: [PATCH 66/74] sssctl: Consistent commands naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use TOPIC-ACTION pattern for sssctl command names. Resolves: https://fedorahosted.org/sssd/ticket/3087 Reviewed-by: Pavel Březina Reviewed-by: Lukáš Slebodník --- src/tools/common/sss_tools.h | 2 ++ src/tools/sss_override.c | 26 +++++++++++------------ src/tools/sssctl/sssctl.c | 22 ++++++++++---------- src/tools/sssctl/sssctl.h | 43 +++++++++++++++++++-------------------- src/tools/sssctl/sssctl_cache.c | 18 ++++++++-------- src/tools/sssctl/sssctl_data.c | 16 +++++++-------- src/tools/sssctl/sssctl_domains.c | 6 +++--- src/tools/sssctl/sssctl_logs.c | 4 ++-- 8 files changed, 69 insertions(+), 68 deletions(-) diff --git a/src/tools/common/sss_tools.h b/src/tools/common/sss_tools.h index a9ebabe21df14eba52f348046c179a91a6394b97..41c8b10e8c2dd8d6a86297b42a71dd5aaf9e556a 100644 --- a/src/tools/common/sss_tools.h +++ b/src/tools/common/sss_tools.h @@ -46,7 +46,9 @@ typedef errno_t void *pvt); #define SSS_TOOL_COMMAND(cmd, msg, err, fn) {cmd, _(msg), err, fn} +#define SSS_TOOL_COMMAND_NOMSG(cmd, err, fn) {cmd, NULL, err, fn} #define SSS_TOOL_DELIMITER(message) {"", (message), 0, NULL} +#define SSS_TOOL_LAST {NULL, NULL, 0, NULL} struct sss_route_cmd { const char *command; diff --git a/src/tools/sss_override.c b/src/tools/sss_override.c index 45a28fd7f5366cd85e6ecd13a4846917d18e9613..d41da52e69acdb67b5a6d624254e3b89a8aa27b8 100644 --- a/src/tools/sss_override.c +++ b/src/tools/sss_override.c @@ -1913,19 +1913,19 @@ static int override_group_export(struct sss_cmdline *cmdline, int main(int argc, const char **argv) { struct sss_route_cmd commands[] = { - {"user-add", NULL, 0, override_user_add}, - {"user-del", NULL, 0, override_user_del}, - {"user-find", NULL, 0, override_user_find}, - {"user-show", NULL, 0, override_user_show}, - {"user-import", NULL, 0, override_user_import}, - {"user-export", NULL, 0, override_user_export}, - {"group-add", NULL, 0, override_group_add}, - {"group-del", NULL, 0, override_group_del}, - {"group-find", NULL, 0, override_group_find}, - {"group-show", NULL, 0, override_group_show}, - {"group-import", NULL, 0, override_group_import}, - {"group-export", NULL, 0, override_group_export}, - {NULL, NULL, 0, NULL} + SSS_TOOL_COMMAND_NOMSG("user-add", 0, override_user_add), + SSS_TOOL_COMMAND_NOMSG("user-del", 0, override_user_del), + SSS_TOOL_COMMAND_NOMSG("user-find", 0, override_user_find), + SSS_TOOL_COMMAND_NOMSG("user-show", 0, override_user_show), + SSS_TOOL_COMMAND_NOMSG("user-import", 0, override_user_import), + SSS_TOOL_COMMAND_NOMSG("user-export", 0, override_user_export), + SSS_TOOL_COMMAND_NOMSG("group-add", 0, override_group_add), + SSS_TOOL_COMMAND_NOMSG("group-del", 0, override_group_del), + SSS_TOOL_COMMAND_NOMSG("group-find", 0, override_group_find), + SSS_TOOL_COMMAND_NOMSG("group-show", 0, override_group_show), + SSS_TOOL_COMMAND_NOMSG("group-import", 0, override_group_import), + SSS_TOOL_COMMAND_NOMSG("group-export", 0, override_group_export), + SSS_TOOL_LAST }; return sss_tool_main(argc, argv, commands, NULL); diff --git a/src/tools/sssctl/sssctl.c b/src/tools/sssctl/sssctl.c index 86656f136c00234a230b8fc779a0d245f0d125d5..20ea26f8f71c26a925f5c37327635e346f497891 100644 --- a/src/tools/sssctl/sssctl.c +++ b/src/tools/sssctl/sssctl.c @@ -257,25 +257,25 @@ int main(int argc, const char **argv) { struct sss_route_cmd commands[] = { SSS_TOOL_DELIMITER("SSSD Status:"), - SSS_TOOL_COMMAND("list-domains", "List available domains", 0, sssctl_list_domains), + SSS_TOOL_COMMAND("domain-list", "List available domains", 0, sssctl_domain_list), SSS_TOOL_COMMAND("domain-status", "Print information about domain", 0, sssctl_domain_status), SSS_TOOL_DELIMITER("Information about cached content:"), - SSS_TOOL_COMMAND("user", "Information about cached user", 0, sssctl_user), - SSS_TOOL_COMMAND("group", "Information about cached group", 0, sssctl_group), - SSS_TOOL_COMMAND("netgroup", "Information about cached netgroup", 0, sssctl_netgroup), + SSS_TOOL_COMMAND("user-show", "Information about cached user", 0, sssctl_user_show), + SSS_TOOL_COMMAND("group-show", "Information about cached group", 0, sssctl_group_show), + SSS_TOOL_COMMAND("netgroup-show", "Information about cached netgroup", 0, sssctl_netgroup_show), SSS_TOOL_DELIMITER("Local data tools:"), - SSS_TOOL_COMMAND("backup-local-data", "Backup local data", 0, sssctl_backup_local_data), - SSS_TOOL_COMMAND("restore-local-data", "Restore local data from backup", 0, sssctl_restore_local_data), - SSS_TOOL_COMMAND("remove-cache", "Backup local data and remove cached content", 0, sssctl_remove_cache), - SSS_TOOL_COMMAND("upgrade-cache", "Perform cache upgrade", ERR_SYSDB_VERSION_TOO_OLD, sssctl_upgrade_cache), + SSS_TOOL_COMMAND("client-data-backup", "Backup local data", 0, sssctl_client_data_backup), + SSS_TOOL_COMMAND("client-data-restore", "Restore local data from backup", 0, sssctl_client_data_restore), + SSS_TOOL_COMMAND("cache-remove", "Backup local data and remove cached content", 0, sssctl_cache_remove), + SSS_TOOL_COMMAND("cache-upgrade", "Perform cache upgrade", ERR_SYSDB_VERSION_TOO_OLD, sssctl_cache_upgrade), SSS_TOOL_DELIMITER("Log files tools:"), - SSS_TOOL_COMMAND("remove-logs", "Remove existing SSSD log files", 0, sssctl_remove_logs), - SSS_TOOL_COMMAND("fetch-logs", "Archive SSSD log files in tarball", 0, sssctl_fetch_logs), + SSS_TOOL_COMMAND("logs-remove", "Remove existing SSSD log files", 0, sssctl_logs_remove), + SSS_TOOL_COMMAND("logs-fetch", "Archive SSSD log files in tarball", 0, sssctl_logs_fetch), #ifdef HAVE_LIBINI_CONFIG_V1_3 SSS_TOOL_DELIMITER("Configuration files tools:"), SSS_TOOL_COMMAND("config-check", "Perform static analysis of SSSD configuration", 0, sssctl_config_check), #endif - {NULL, NULL, 0, NULL} + SSS_TOOL_LAST }; return sss_tool_main(argc, argv, commands, NULL); diff --git a/src/tools/sssctl/sssctl.h b/src/tools/sssctl/sssctl.h index be624755de531df9ff5a97f5640266801695ef6e..72930ee5c3a1195e90c6e35768f715cbf6a1c4e1 100644 --- a/src/tools/sssctl/sssctl.h +++ b/src/tools/sssctl/sssctl.h @@ -56,52 +56,51 @@ void _sssctl_sifp_error(sss_sifp_ctx *sifp, #define sssctl_sifp_error(sifp, error, message) \ _sssctl_sifp_error(sifp, error, _(message)) -errno_t sssctl_list_domains(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt); +errno_t sssctl_domain_list(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt); errno_t sssctl_domain_status(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt); -errno_t sssctl_backup_local_data(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt); - -errno_t sssctl_restore_local_data(struct sss_cmdline *cmdline, +errno_t sssctl_client_data_backup(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt); -errno_t sssctl_remove_cache(struct sss_cmdline *cmdline, +errno_t sssctl_client_data_restore(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt); + +errno_t sssctl_cache_remove(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt); -errno_t sssctl_upgrade_cache(struct sss_cmdline *cmdline, +errno_t sssctl_cache_upgrade(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt); -errno_t sssctl_remove_logs(struct sss_cmdline *cmdline, +errno_t sssctl_logs_remove(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt); -errno_t sssctl_fetch_logs(struct sss_cmdline *cmdline, +errno_t sssctl_logs_fetch(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt); -errno_t sssctl_user(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt); +errno_t sssctl_user_show(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt); -errno_t sssctl_group(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt); +errno_t sssctl_group_show(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt); -errno_t sssctl_netgroup(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt); +errno_t sssctl_netgroup_show(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt); errno_t sssctl_config_check(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt); - #endif /* _SSSCTL_H_ */ diff --git a/src/tools/sssctl/sssctl_cache.c b/src/tools/sssctl/sssctl_cache.c index 4a1f3558ed7064ca40ccf9313d99fbab36e6e4c9..b1a7cc933d58d99fe34a05cb6eabe11a5270cee1 100644 --- a/src/tools/sssctl/sssctl_cache.c +++ b/src/tools/sssctl/sssctl_cache.c @@ -569,9 +569,9 @@ struct sssctl_cache_opts { int id; }; -errno_t sssctl_user(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt) +errno_t sssctl_user_show(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt) { struct sssctl_cache_opts opts = {0}; const char *attr; @@ -616,9 +616,9 @@ errno_t sssctl_user(struct sss_cmdline *cmdline, return EOK; } -errno_t sssctl_group(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt) +errno_t sssctl_group_show(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt) { struct sssctl_cache_opts opts = {0}; const char *attr; @@ -662,9 +662,9 @@ errno_t sssctl_group(struct sss_cmdline *cmdline, return EOK; } -errno_t sssctl_netgroup(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt) +errno_t sssctl_netgroup_show(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt) { struct sssctl_cache_opts opts = {0}; errno_t ret; diff --git a/src/tools/sssctl/sssctl_data.c b/src/tools/sssctl/sssctl_data.c index 3ab2ddf20006b2d5a26e2f167819677431854eb6..a26ddd8d5200319e75282b738791cf270f0d75a8 100644 --- a/src/tools/sssctl/sssctl_data.c +++ b/src/tools/sssctl/sssctl_data.c @@ -124,9 +124,9 @@ static errno_t sssctl_backup(bool force) return ret; } -errno_t sssctl_backup_local_data(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt) +errno_t sssctl_client_data_backup(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt) { struct sssctl_data_opts opts = {0}; errno_t ret; @@ -184,9 +184,9 @@ static errno_t sssctl_restore(bool force_start, bool force_restart) return ret; } -errno_t sssctl_restore_local_data(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt) +errno_t sssctl_client_data_restore(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt) { struct sssctl_data_opts opts = {0}; errno_t ret; @@ -207,7 +207,7 @@ errno_t sssctl_restore_local_data(struct sss_cmdline *cmdline, return sssctl_restore(opts.start, opts.restart); } -errno_t sssctl_remove_cache(struct sss_cmdline *cmdline, +errno_t sssctl_cache_remove(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt) { @@ -259,7 +259,7 @@ errno_t sssctl_remove_cache(struct sss_cmdline *cmdline, return EOK; } -errno_t sssctl_upgrade_cache(struct sss_cmdline *cmdline, +errno_t sssctl_cache_upgrade(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt) { diff --git a/src/tools/sssctl/sssctl_domains.c b/src/tools/sssctl/sssctl_domains.c index 5aaaf770981a92b80b9376fd244d2d97e0502dac..cfc4e56133213e27496350033d4d28c3f5b5c63d 100644 --- a/src/tools/sssctl/sssctl_domains.c +++ b/src/tools/sssctl/sssctl_domains.c @@ -27,9 +27,9 @@ #include "sbus/sssd_dbus.h" #include "responder/ifp/ifp_iface.h" -errno_t sssctl_list_domains(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt) +errno_t sssctl_domain_list(struct sss_cmdline *cmdline, + struct sss_tool_ctx *tool_ctx, + void *pvt) { sss_sifp_ctx *sifp; sss_sifp_error error; diff --git a/src/tools/sssctl/sssctl_logs.c b/src/tools/sssctl/sssctl_logs.c index a203474648e3c1719e16146f8f7b484f9d62541c..883f2ac2fa688b672cd8f388e4c571d1a12a32af 100644 --- a/src/tools/sssctl/sssctl_logs.c +++ b/src/tools/sssctl/sssctl_logs.c @@ -34,7 +34,7 @@ struct sssctl_logs_opts { int archived; }; -errno_t sssctl_remove_logs(struct sss_cmdline *cmdline, +errno_t sssctl_logs_remove(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt) { @@ -74,7 +74,7 @@ errno_t sssctl_remove_logs(struct sss_cmdline *cmdline, return EOK; } -errno_t sssctl_fetch_logs(struct sss_cmdline *cmdline, +errno_t sssctl_logs_fetch(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt) { -- 2.4.11