From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Fri, 18 Nov 2022 21:32:00 +0000 (+0100)
Subject: replication: Use the new listener type field to distinguish the various listener... 
X-Git-Tag: 2.4.0~3301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e36c947cd747944611edf06879f6319840dd54f3;p=thirdparty%2Fdovecot%2Fcore.git

replication: Use the new listener type field to distinguish the various listener types.
---

diff --git a/src/replication/replicator/replicator-settings.c b/src/replication/replicator/replicator-settings.c
index f837aba243..25e2238d66 100644
--- a/src/replication/replicator/replicator-settings.c
+++ b/src/replication/replicator/replicator-settings.c
@@ -20,6 +20,7 @@ static struct file_listener_settings replicator_unix_listeners_array[] = {
 	},
 	{
 		.path = "replicator-doveadm",
+		.type = "doveadm",
 		.mode = 0,
 		.user = "$default_internal_user",
 		.group = "",
diff --git a/src/replication/replicator/replicator.c b/src/replication/replicator/replicator.c
index c85b376620..37ea293e38 100644
--- a/src/replication/replicator/replicator.c
+++ b/src/replication/replicator/replicator.c
@@ -25,8 +25,11 @@ static struct timeout *to_dump;
 
 static void client_connected(struct master_service_connection *conn)
 {
+	const char *type;
+
 	master_service_client_connection_accept(conn);
-	if (strcmp(conn->name, "replicator-doveadm") == 0)
+	type = master_service_connection_get_type(conn);
+	if (strcmp(type, "doveadm") == 0)
 		doveadm_connection_create(brain, conn->fd);
 	else
 		(void)notify_connection_create(conn->fd, queue);