From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Tue, 5 Apr 2022 11:33:48 +0000 (+0300)
Subject: submission-proxy: Add IPV6: prefix to IPv6 addresses
X-Git-Tag: 2.4.0~4154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88751f93d04816313f0fbcafe3a7fc018f5b9328;p=thirdparty%2Fdovecot%2Fcore.git

submission-proxy: Add IPV6: prefix to IPv6 addresses

This is required by the Postfix XCLIENT protocol.
---

diff --git a/src/submission-login/submission-proxy.c b/src/submission-login/submission-proxy.c
index 4965ca4612..b6b6b61b12 100644
--- a/src/submission-login/submission-proxy.c
+++ b/src/submission-login/submission-proxy.c
@@ -177,8 +177,10 @@ proxy_send_xclient(struct submission_client *client, struct ostream *output)
 			t_strdup_printf("%u", client->common.remote_port));
 	}
 	if (str_array_icase_find(client->proxy_xclient, "ADDR")) {
-		proxy_send_xclient_more(client, output, str, "ADDR",
-					net_ip2addr(&client->common.ip));
+		const char *addr = net_ip2addr(&client->common.ip);
+		if (client->common.ip.family == AF_INET6)
+			addr = t_strconcat("IPV6:", addr, NULL);
+		proxy_send_xclient_more(client, output, str, "ADDR", addr);
 	}
 	if (str_array_icase_find(client->proxy_xclient, "SESSION")) {
 		proxy_send_xclient_more(client, output, str, "SESSION",