diff options
author | Michal Židek <mzidek@redhat.com> | 2016-07-25 13:50:13 +0200 |
---|---|---|
committer | Lukas Slebodnik <lslebodn@redhat.com> | 2016-08-05 12:25:50 +0200 |
commit | 488b455f6b7881ec108a127840b1c1f1523d937f (patch) | |
tree | 1459d631cfb3756822cf175edb9fb299ec493a1b /src/tools/sssctl | |
parent | 9dc081500979616f9af623ebe2d52837c211759f (diff) | |
download | sssd-488b455f6b7881ec108a127840b1c1f1523d937f.tar.gz sssd-488b455f6b7881ec108a127840b1c1f1523d937f.tar.xz sssd-488b455f6b7881ec108a127840b1c1f1523d937f.zip |
sssctl: Consistent commands naming
Use TOPIC-ACTION pattern for sssctl command
names.
Resolves:
https://fedorahosted.org/sssd/ticket/3087
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
Diffstat (limited to 'src/tools/sssctl')
-rw-r--r-- | src/tools/sssctl/sssctl.c | 22 | ||||
-rw-r--r-- | src/tools/sssctl/sssctl.h | 43 | ||||
-rw-r--r-- | src/tools/sssctl/sssctl_cache.c | 18 | ||||
-rw-r--r-- | src/tools/sssctl/sssctl_data.c | 16 | ||||
-rw-r--r-- | src/tools/sssctl/sssctl_domains.c | 6 | ||||
-rw-r--r-- | src/tools/sssctl/sssctl_logs.c | 4 |
6 files changed, 54 insertions, 55 deletions
diff --git a/src/tools/sssctl/sssctl.c b/src/tools/sssctl/sssctl.c index 86656f136..20ea26f8f 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 be624755d..72930ee5c 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 4a1f3558e..b1a7cc933 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 3ab2ddf20..a26ddd8d5 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 5aaaf7709..cfc4e5613 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 a20347464..883f2ac2f 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) { |