changeset 19989:103c6f797c1c

doveadm sync: -R parameter shouldn't switch to "doveadm backup -R" behavior. Just ignore the -R parameter for doveadm sync, unless -1 parameter is also used. Alternatively we could also fail the command, but maybe that's unnecessary extra work.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Wed, 06 Apr 2016 22:12:54 +0300
parents e030bfa55139
children c4504c853f8e
files src/doveadm/doveadm-dsync.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/doveadm/doveadm-dsync.c	Wed Apr 06 22:08:14 2016 +0300
+++ b/src/doveadm/doveadm-dsync.c	Wed Apr 06 22:12:54 2016 +0300
@@ -609,10 +609,12 @@
 	if (ctx->no_mailbox_renames)
 		brain_flags |= DSYNC_BRAIN_FLAG_NO_MAILBOX_RENAMES;
 
-	if (ctx->reverse_backup)
-		brain_flags |= DSYNC_BRAIN_FLAG_BACKUP_RECV;
-	else if (ctx->backup)
-		brain_flags |= DSYNC_BRAIN_FLAG_BACKUP_SEND;
+	if (ctx->backup) {
+		if (ctx->reverse_backup)
+			brain_flags |= DSYNC_BRAIN_FLAG_BACKUP_RECV;
+		else
+			brain_flags |= DSYNC_BRAIN_FLAG_BACKUP_SEND;
+	}
 
 	if (ctx->no_mail_sync)
 		brain_flags |= DSYNC_BRAIN_FLAG_NO_MAIL_SYNC;