Merge pull request #39607 from FedericoHeichou/fix-double-dots-with-p…

…ipe-sendmail
nextcloud · Feb 23, 2024 · 6c837fd · 6c837fd
2 parents a88c1bd + 609e751
commit 6c837fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -331,7 +331,7 @@ protected function getSendMailInstance(): SendmailTransport {
 		}
 
 		$binaryParam = match ($this->config->getSystemValueString('mail_sendmailmode', 'smtp')) {
-			'pipe' => ' -t',
+			'pipe' => ' -t -i',
 			default => ' -bs',
 		};
 

diff --git 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'],
 		];
 	}