Fallback to default path is sendmail can't be found

If the sendmail binary can't be found at all we fallback to the default
path.
It most likely is not there but then at least a proper error message
pops up.

Updated the tests to also properly pass.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php
index 79208f9a695..df23b669365 100644
--- a/lib/private/Mail/Mailer.php
+++ b/lib/private/Mail/Mailer.php
@@ -274,7 +274,11 @@ class Mailer implements IMailer {
 				$binaryPath = '/var/qmail/bin/sendmail';
 				break;
 			default:
-				$binaryPath = \OC_Helper::findBinaryPath('sendmail');
+				$sendmail = \OC_Helper::findBinaryPath('sendmail');
+				if ($sendmail === null) {
+					$sendmail = '/usr/sbin/sendmail';
+				}
+				$binaryPath = $sendmail;
 				break;
 		}