From e9972a63962c7895827da5aef7b88cc62a482141 Mon Sep 17 00:00:00 2001 From: Edmund Lodewijks Date: Wed, 5 Nov 2025 12:21:41 +0200 Subject: [PATCH] FIX dsync_remote_cmd: Remove obsolete and removed "-U" parameter This PR intends to fix an error due to the default doveadm settings adding the obsolete and removed "-U" parameter to dsync. The option "-U" was removed in commit 4c04e4c30fd (July 7, 2023) - "global: Remove replicator" removed. The "-U" parameter in the doveadm_settings struct was probably overlooked and causes errors like this: ``` doveadm sync -1 -u name@domain.tld remote:sub.remote.tld dsync-server: invalid option -- 'U' Error: doveadm: Unexpected or incomplete option: -U dsync-local(name@domain.tld): Error: read(sub.remote.tld) failed: EOF (version not received) dsync-local(name@domain.tld): Error: cmd sync: Remote command returned error 64: ssh sub.remote.tld doveadm dsync-server -uname@domain.tld -U ``` See also: https://dovecot.org/mailman3/archives/list/dovecot@dovecot.org/message/B3TQFAHCYVVXXEL4Y7KOPKJRWZ5I6X7D/ --- src/doveadm/doveadm-settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c index 690f999b81..690ccf7228 100644 --- a/src/doveadm/doveadm-settings.c +++ b/src/doveadm/doveadm-settings.c @@ -106,7 +106,7 @@ const struct doveadm_settings doveadm_default_settings = { .doveadm_password = "", .doveadm_allowed_commands = ARRAY_INIT, .dsync_alt_char = "_", - .dsync_remote_cmd = "ssh -l%{login} %{host} doveadm dsync-server -u%{user} -U", + .dsync_remote_cmd = "ssh -l%{login} %{host} doveadm dsync-server -u%{user}", .dsync_features = "", .dsync_hashed_headers = "Date Message-ID", .dsync_commit_msgs_interval = 100,