From: Wido den Hollander <wido@widodh.nl>
Date: Sat, 9 Apr 2016 11:43:16 +0000 (+0200)
Subject: lmtp: Use port 24 if no port has been provided
X-Git-Tag: 2.3.0.rc1~3232
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfe53c824fb6f6e3736ee2958665dd6f545724b1;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: Use port 24 if no port has been provided

This allows using the LMTP, IMAP and POP3 proxy on the same
Dovecot installation without the userdb providing the port
to connect to.

TCP port 24 is registered at IANA as: "any private mail system"

LMTP being the Local Mail Transfer Protocol classifies as a private
mail system and thus justifies the usage of port 24.

Prior to this patch the LTMP client would connect to TCP port 0 by
default if the userdb did not provide a port to connect to.
---

diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index 8798f0698b..7fa3b63ed4 100644
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -263,6 +263,8 @@ client_proxy_rcpt_parse_fields(struct lmtp_proxy_rcpt_settings *set,
 		} else if (strcmp(key, "protocol") == 0) {
 			if (strcmp(value, "lmtp") == 0)
 				set->protocol = LMTP_CLIENT_PROTOCOL_LMTP;
+				if (!port_set)
+					set->port = 24;
 			else if (strcmp(value, "smtp") == 0) {
 				set->protocol = LMTP_CLIENT_PROTOCOL_SMTP;
 				if (!port_set)