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 4965ca461295c91cd1319f562aed1a92b5d99906..b6b6b61b12e6e28e212d1dc6c0dd61233ab7ac8f 100644 (file)
--- 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",