doveadm: Hide "dsync-server" from list of commands.

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 872fe8f10bbd8af4afc0c62816711f1b2a7108f8..b5203c448b9b746484f4d2cef5ecc0006ea9c61f 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -29,6 +29,7 @@ ARRAY_TYPE(doveadm_mail_cmd) doveadm_mail_cmds;
 void (*hook_doveadm_mail_init)(struct doveadm_mail_cmd_context *ctx);
 struct doveadm_mail_cmd_module_register
        doveadm_mail_cmd_module_register = { 0 };
+char doveadm_mail_cmd_hide = '\0';
 
 static int killed_signo = 0;
 
@@ -518,6 +519,8 @@ void doveadm_mail_usage(string_t *out)
        const struct doveadm_mail_cmd *cmd;
 
        array_foreach(&doveadm_mail_cmds, cmd) {
+               if (cmd->usage_args == &doveadm_mail_cmd_hide)
+                       continue;
                str_printfa(out, "%s\t[-u <user>|-A] [-S <socket_path>]",
                            cmd->name);
                if (cmd->usage_args != NULL)

diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index adca10667867451b3f395e6ce61d173f79b78825..4d59fa620f65b46529645f6ec7758806ab6d8ef6 100644 (file)
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -72,6 +72,7 @@ ARRAY_DEFINE_TYPE(doveadm_mail_cmd, struct doveadm_mail_cmd);
 extern ARRAY_TYPE(doveadm_mail_cmd) doveadm_mail_cmds;
 extern void (*hook_doveadm_mail_init)(struct doveadm_mail_cmd_context *ctx);
 extern struct doveadm_mail_cmd_module_register doveadm_mail_cmd_module_register;
+extern char doveadm_mail_cmd_hide;
 
 bool doveadm_mail_try_run(const char *cmd_name, int argc, char *argv[]);
 void doveadm_mail_register_cmd(const struct doveadm_mail_cmd *cmd);

diff --git a/src/doveadm/dsync/doveadm-dsync.c b/src/doveadm/dsync/doveadm-dsync.c
index 85d7cea3ea672e253582d1f895ba4ef5bb56e76c..0ed585bed2f0f522a5914dab95174d627adc43b8 100644 (file)
--- a/src/doveadm/dsync/doveadm-dsync.c
+++ b/src/doveadm/dsync/doveadm-dsync.c
@@ -379,7 +379,7 @@ struct doveadm_mail_cmd cmd_dsync_backup = {
        "[-fR] [-m <mailbox>] <dest>"
 };
 struct doveadm_mail_cmd cmd_dsync_server = {
-       cmd_dsync_server_alloc, "dsync-server", NULL
+       cmd_dsync_server_alloc, "dsync-server", &doveadm_mail_cmd_hide
 };
 
 void doveadm_dsync_main(int *_argc, char **_argv[])