From 5581b701c1d766b16c821aad24cd76b0c05e4f53 Mon Sep 17 00:00:00 2001 From: FedericoHeichou Date: Fri, 28 Jul 2023 09:34:16 +0200 Subject: [PATCH 1/3] Add "-i" to sendmail's pipe Signed-off-by: FedericoHeichou --- apps/settings/templates/settings/admin/additional-mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/settings/templates/settings/admin/additional-mail.php b/apps/settings/templates/settings/admin/additional-mail.php index c6548d88737b0..4e81e52c83bb2 100644 --- a/apps/settings/templates/settings/admin/additional-mail.php +++ b/apps/settings/templates/settings/admin/additional-mail.php @@ -45,7 +45,7 @@ $mail_sendmailmode = [ 'smtp' => 'smtp (-bs)', - 'pipe' => 'pipe (-t)' + 'pipe' => 'pipe (-t -i)' ]; ?> From e61f0b82c71e8b50c9de3ee39c5393bdfec7dc90 Mon Sep 17 00:00:00 2001 From: FedericoHeichou Date: Fri, 28 Jul 2023 14:46:23 +0200 Subject: [PATCH 2/3] Add "-i" to MailTest's pipe Signed-off-by: FedericoHeichou [skip ci] --- tests/lib/Mail/MailerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php index 5ffba9392841e..aa62c9a319deb 100644 --- a/tests/lib/Mail/MailerTest.php +++ b/tests/lib/Mail/MailerTest.php @@ -72,7 +72,7 @@ protected function setUp(): void { public function sendmailModeProvider(): array { return [ 'smtp' => ['smtp', ' -bs'], - 'pipe' => ['pipe', ' -t'], + 'pipe' => ['pipe', ' -t -i'], ]; } From 477c020db8e27daa625fda3c1391623742b3a812 Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Thu, 29 Feb 2024 10:37:00 +0100 Subject: [PATCH 3/3] Fix backport Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> --- lib/private/Mail/Mailer.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index 7d249338bdcaf..60f6c4580ca5a 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -350,14 +350,10 @@ protected function getSendMailInstance(): SendmailTransport { break; } - switch ($this->config->getSystemValueString('mail_sendmailmode', 'smtp')) { - case 'pipe': - $binaryParam = ' -t'; - break; - default: - $binaryParam = ' -bs'; - break; - } + $binaryParam = match ($this->config->getSystemValueString('mail_sendmailmode', 'smtp')) { + 'pipe' => ' -t -i', + default => ' -bs', + }; return new SendmailTransport($binaryPath . $binaryParam, null, $this->logger); }