From 3f1d909e923b86e9cf80e74f17749d83943471cc Mon Sep 17 00:00:00 2001 From: Alexey Tikhonov Date: Mon, 15 Jan 2024 16:32:18 +0100 Subject: [PATCH] TOOLS: remove the upgrade-cache command 552390afcc81af96ca201fa6c25ddefbbecbeb4e mentioned ``` might be useful e.g. in RPM %post scripts. ``` but it didn't happen. SSSD performs cache upgrade at startup automatically, explicit command doesn't have any use. On the other hand, it can spoil cache files ownership if users used to run 'sssctl' and SSSD do not match. :relnote: sssct `cache-upgrade` command was removed. SSSD performs automatic upgrade at startup when needed. --- src/tools/sssctl/sssctl.c | 1 - src/tools/sssctl/sssctl.h | 4 ---- src/tools/sssctl/sssctl_data.c | 34 ---------------------------------- 3 files changed, 39 deletions(-) diff --git a/src/tools/sssctl/sssctl.c b/src/tools/sssctl/sssctl.c index c494b4e4201..6fbfc95631b 100644 --- a/src/tools/sssctl/sssctl.c +++ b/src/tools/sssctl/sssctl.c @@ -327,7 +327,6 @@ int main(int argc, const char **argv) 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_COMMAND("cache-expire", "Invalidate cached objects", 0, sssctl_cache_expire), SSS_TOOL_COMMAND("cache-index", "Manage cache indexes", 0, sssctl_cache_index), SSS_TOOL_DELIMITER("Log files tools:"), diff --git a/src/tools/sssctl/sssctl.h b/src/tools/sssctl/sssctl.h index 3a53a890476..2b35609bdc7 100644 --- a/src/tools/sssctl/sssctl.h +++ b/src/tools/sssctl/sssctl.h @@ -81,10 +81,6 @@ errno_t sssctl_cache_remove(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt); -errno_t sssctl_cache_upgrade(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt); - errno_t sssctl_cache_expire(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt); diff --git a/src/tools/sssctl/sssctl_data.c b/src/tools/sssctl/sssctl_data.c index 82f80c61e58..ef7ae574bf2 100644 --- a/src/tools/sssctl/sssctl_data.c +++ b/src/tools/sssctl/sssctl_data.c @@ -259,40 +259,6 @@ errno_t sssctl_cache_remove(struct sss_cmdline *cmdline, return EOK; } -errno_t sssctl_cache_upgrade(struct sss_cmdline *cmdline, - struct sss_tool_ctx *tool_ctx, - void *pvt) -{ - 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_daemon_running()) { - return ERR_SSSD_RUNNING; - } - - ret = confdb_get_domains(tool_ctx->confdb, &tool_ctx->domains); - if (ret != EOK) { - DEBUG(SSSDBG_FATAL_FAILURE, "No domains configured.\n"); - return ret; - } - - db_up_ctx.cdb = tool_ctx->confdb; - ret = sysdb_init_ext(tool_ctx, tool_ctx->domains, &db_up_ctx, - true, 0, 0); - if (ret != EOK) { - SYSDB_VERSION_ERROR_DAEMON(ret); - return ret; - } - - return EOK; -} - errno_t sssctl_cache_expire(struct sss_cmdline *cmdline, struct sss_tool_ctx *tool_ctx, void *pvt)