From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sun, 23 Sep 2018 17:53:07 +0000 (+0200)
Subject: submission: relay backend: Add support for relaying to a unix socket.
X-Git-Tag: 2.3.9~1205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69e8b91d0ac85ef79c1bb28663afab0b78e82dc5;p=thirdparty%2Fdovecot%2Fcore.git

submission: relay backend: Add support for relaying to a unix socket.
---

diff --git a/src/submission/submission-backend-relay.c b/src/submission/submission-backend-relay.c
index 0832ba7a8a..98cbd916e3 100644
--- a/src/submission/submission-backend-relay.c
+++ b/src/submission/submission-backend-relay.c
@@ -893,9 +893,14 @@ submission_backend_relay_create(
 	smtp_set.connect_timeout_msecs = set->connect_timeout_msecs;
 	smtp_set.command_timeout_msecs = set->command_timeout_msecs;
 
-	backend->conn = smtp_client_connection_create(
-		smtp_client, set->protocol, set->host, set->port,
-		set->ssl_mode, &smtp_set);
+	if (set->path == NULL) {
+		backend->conn = smtp_client_connection_create(
+			smtp_client, set->protocol, set->host, set->port,
+			set->ssl_mode, &smtp_set);
+	} else {
+		backend->conn = smtp_client_connection_create_unix(
+			smtp_client, set->protocol, set->path, &smtp_set);
+	}
 
 	return &backend->backend;
 }
diff --git a/src/submission/submission-backend-relay.h b/src/submission/submission-backend-relay.h
index ea9c66cf8d..7242702dc6 100644
--- a/src/submission/submission-backend-relay.h
+++ b/src/submission/submission-backend-relay.h
@@ -11,7 +11,7 @@ struct submision_backend_relay_settings {
 	const char *my_hostname;
 
 	enum smtp_protocol protocol;
-	const char *host;
+	const char *path, *host;
 	in_port_t port;
 
 	const char *user, *master_user;