From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 30 Nov 2022 12:48:13 +0000 (+0200)
Subject: dsync: Sync also namespaces where empty location setting came from userdb or -o parameter
X-Git-Tag: 2.4.0~3340
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=649d46e1afff78e43b78d5cd8c1623d4f0a116da;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Sync also namespaces where empty location setting came from userdb or -o parameter
---

diff --git a/src/doveadm/dsync/dsync-brain.c b/src/doveadm/dsync/dsync-brain.c
index e6b974e963..a47e85c36b 100644
--- a/src/doveadm/dsync/dsync-brain.c
+++ b/src/doveadm/dsync/dsync-brain.c
@@ -882,8 +882,13 @@ bool dsync_brain_want_namespace(struct dsync_brain *brain,
 			return TRUE;
 		return FALSE;
 	} else {
+		/* By default sync only namespaces that have empty location.
+		   The unexpanded_location can be already expanded if it
+		   came from userdb or -o parameter. */
 		return strcmp(ns->set->unexpanded_location,
-			      SETTING_STRVAR_UNEXPANDED) == 0;
+			      SETTING_STRVAR_UNEXPANDED) == 0 ||
+			strcmp(ns->set->unexpanded_location,
+			       SETTING_STRVAR_EXPANDED) == 0;
 	}
 }