From nobody Mon Jun 1 12:20:05 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gTY1y1CwTz6fcwM for ; Mon, 01 Jun 2026 12:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gTY1y0M0Jz3QVl for ; Mon, 01 Jun 2026 12:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780316406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jAQKNRkoS0gOG7DgjlSD8wqeZNtOsZZTaWgCH/qzab8=; b=LctlkjZj7nquXopKnaPGUIxkyrxliG1nZzkncqjk8Ch6PUDwInRZQL8W1VFsIEnyYx3aG8 liWI/2YQpSPtUIucE0T7nuH/9l+ee+wgXUu3q+/rTuBKwPls0y/s0freDWTDYjPM6rfwKm wqlGrfgMaXwLO/bu9MInsnsK5fkW7eXEbiUNJuvL6n7nAexLgaTXiNKEPrlP/AURaFjWNT a2LXE+WK/5IQEBjXaumDn2QA/NMmvaBhNJYNYOwMdrv6+8V3hZFUkzLc3+RVBdPRmB/QoW pwdZwRnkUd3y02qu06BtBoZAHgIe8D3TJBECbh2ey8YzDrOIyZeK5mAYtoC3mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780316406; a=rsa-sha256; cv=none; b=Rw8k7l8tqxhP0QaA1yoxMJWnxe5Q6pbG8CgL42P1HKErJarTx+y/rvOR6jA0JjN1D9QV2a dTtKcT7cZoNXmiV6BtclO+UeMSOFRs/cIo6I3keLcETKqeAiQLF1QaqJwiau0WYV4JaIqb yduwPovAP3JE6OzlRrNPuCXBNZWJq/mJTgAgNOX5wWQ6oso+EqRE6nfkckAIZXXd/DqUfU 34Uhx0Gbc6fDRh7MZnlaXn3SO6ZrI9bcs60qF6PuLwn8x2Z1pRbUYBQuG8OFyAFi3Qh/6j 5mZR6EkNaXmB52QEiYQBFyCaR38T7hyAIuAyM5z77kYcHa3v+Bb9NEfNGNXEsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780316406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jAQKNRkoS0gOG7DgjlSD8wqeZNtOsZZTaWgCH/qzab8=; b=Urzp7PlMGI+LWR3JRWsIT5iel2tRELQcHjOpXrvRow10uNadyPhzOkMrdRt5qoQWZhw0Ni 59HJBZ+VTxCBowmhgtm2pVdiv8cU2WC2QBxI4tFyLFNg5YhgZp7UuNjw20ihuT051m/vZh HTVbrN1Ai4SfyBPU3Y/L+gT3+0MTsx/p0GsFpEuTMm1l2/EugtYt4J6KwIpbg9qpYaHtjw 9pJfEPBg9y9YYr1ih7g5cXQLSCMnSFhrFwm18WaOzcKEVY4s9OChYlTOuNkFUr7CtodOga 8w+8jeM+LWeIW+xkdKK91RatrUeej2s18AS+9dQwjhOF+Xikfq6PHFp/GTCQ/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gTY1x70qkzdjm for ; Mon, 01 Jun 2026 12:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21824 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Jun 2026 12:20:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pietro Cerutti Subject: git: 84dd0acd1c8c - main - dma: support relaying to an LMTP endpoint List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84dd0acd1c8c93b8e5074f895a30dc49bc00c8d3 Auto-Submitted: auto-generated Date: Mon, 01 Jun 2026 12:20:05 +0000 Message-Id: <6a1d78f5.21824.10a9b36e@gitrepo.freebsd.org> The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/src/commit/?id=84dd0acd1c8c93b8e5074f895a30dc49bc00c8d3 commit 84dd0acd1c8c93b8e5074f895a30dc49bc00c8d3 Author: Pietro Cerutti AuthorDate: 2026-06-01 12:19:57 +0000 Commit: Pietro Cerutti CommitDate: 2026-06-01 12:19:57 +0000 dma: support relaying to an LMTP endpoint Approved by: bapt Differential Revision: https://reviews.freebsd.org/D55627 Upstream: https://github.com/corecode/dma/pull/152 --- contrib/dma/conf.c | 7 +++++++ contrib/dma/dma.conf | 3 +++ contrib/dma/dma.h | 1 + contrib/dma/net.c | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/contrib/dma/conf.c b/contrib/dma/conf.c index 13cfac7a6de4..947e0a6cdec1 100644 --- a/contrib/dma/conf.c +++ b/contrib/dma/conf.c @@ -198,6 +198,8 @@ parse_conf(const char *config_path) config.authpath= data; else if (strcmp(word, "CERTFILE") == 0 && data != NULL) config.certfile = data; + else if (strcmp(word, "LMTP") == 0 && data == NULL) + config.features |= LMTP; else if (strcmp(word, "MAILNAME") == 0 && data != NULL) config.mailname = data; else if (strcmp(word, "MASQUERADE") == 0 && data != NULL) { @@ -257,5 +259,10 @@ parse_conf(const char *config_path) /* NOTREACHED */ } + if ((config.features & LMTP) && (config.features & (TLS_OPP | STARTTLS | SECURETRANSFER))) { + errlogx(EX_CONFIG, "%s: LMTP does not support TLS", config_path); + /* NOTREACHED */ + } + fclose(conf); } diff --git a/contrib/dma/dma.conf b/contrib/dma/dma.conf index fa95fc1a0c22..e5f414b235bf 100644 --- a/contrib/dma/dma.conf +++ b/contrib/dma/dma.conf @@ -68,3 +68,6 @@ # Directly forward the mail to the SMARTHOST bypassing aliases and local delivery #NULLCLIENT + +# Use LMTP instead of SMTP for relaying +#LMTP diff --git a/contrib/dma/dma.h b/contrib/dma/dma.h index 9e7f6cd2c431..ae03075c0892 100644 --- a/contrib/dma/dma.h +++ b/contrib/dma/dma.h @@ -70,6 +70,7 @@ #define FULLBOUNCE 0x040 /* Bounce the full message */ #define TLS_OPP 0x080 /* Opportunistic STARTTLS */ #define NULLCLIENT 0x100 /* Nullclient support */ +#define LMTP 0x400 /* Use LMTP instead of SMTP with the relay */ #ifndef CONF_PATH #error Please define CONF_PATH diff --git a/contrib/dma/net.c b/contrib/dma/net.c index 0079875a22e0..02a31e9673a7 100644 --- a/contrib/dma/net.c +++ b/contrib/dma/net.c @@ -390,7 +390,7 @@ int perform_server_greeting(int fd, struct smtp_features* features) { Send EHLO XXX allow HELO fallback */ - send_remote_command(fd, "EHLO %s", hostname()); + send_remote_command(fd, "%s %s", config.features & LMTP ? "LHLO" : "EHLO", hostname()); char buffer[EHLO_RESPONSE_SIZE]; memset(buffer, 0, sizeof(buffer));