Merge pull request #11404 from flokli/sendmail-path

Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail
nextcloud · Nov 2, 2018 · 4ba709b · 4ba709b
2 parents 30a1237 + 054056a
commit 4ba709b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php
@@ -274,7 +274,11 @@ protected function getSendMailInstance(): \Swift_SendmailTransport {
 				$binaryPath = '/var/qmail/bin/sendmail';
 				break;
 			default:
-				$binaryPath = '/usr/sbin/sendmail';
+				$sendmail = \OC_Helper::findBinaryPath('sendmail');
+				if ($sendmail === null) {
+					$sendmail = '/usr/sbin/sendmail';
+				}
+				$binaryPath = $sendmail;
 				break;
 		}
 

diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php
@@ -55,7 +55,13 @@ public function testGetSendMailInstanceSendMail() {
 			->with('mail_smtpmode', 'smtp')
 			->will($this->returnValue('sendmail'));
 
-		$this->assertEquals(new \Swift_SendmailTransport('/usr/sbin/sendmail -bs'), self::invokePrivate($this->mailer, 'getSendMailInstance'));
+		$path = \OC_Helper::findBinaryPath('sendmail');
+		if ($path === null) {
+			$path = '/usr/sbin/sendmail';
+		}
+
+		$expected = new \Swift_SendmailTransport($path . ' -bs');
+		$this->assertEquals($expected, self::invokePrivate($this->mailer, 'getSendMailInstance'));
 	}
 
 	public function testGetSendMailInstanceSendMailQmail() {