From 3cf66ae1568b5151116600682af795dee7811e80 Mon Sep 17 00:00:00 2001 From: FedericoHeichou Date: Fri, 28 Jul 2023 09:34:16 +0200 Subject: [PATCH 1/2] Add "-i" to sendmail's pipe Signed-off-by: FedericoHeichou --- apps/settings/templates/settings/admin/additional-mail.php | 2 +- lib/private/Mail/Mailer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/settings/templates/settings/admin/additional-mail.php b/apps/settings/templates/settings/admin/additional-mail.php index 7b88e99736954..7f0f362e9554e 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)' ]; ?> diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index 9b7b3cf117b03..61dc6f9214be6 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -331,7 +331,7 @@ protected function getSendMailInstance(): SendmailTransport { } $binaryParam = match ($this->config->getSystemValueString('mail_sendmailmode', 'smtp')) { - 'pipe' => ' -t', + 'pipe' => ' -t -i', default => ' -bs', }; From 609e751667246eb4e2b5dd27305deab4bb03e5b6 Mon Sep 17 00:00:00 2001 From: FedericoHeichou Date: Fri, 28 Jul 2023 14:46:23 +0200 Subject: [PATCH 2/2] Add "-i" to MailTest's pipe Signed-off-by: FedericoHeichou --- 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 418bfe35c6e57..0eee7db126a71 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'], ]; }