From: Indrek Ardel <indrek@ardel.eu>
Date: Sat, 9 May 2020 00:08:14 +0000 (+0300)
Subject: Fix default sendmail path when not found during build
X-Git-Tag: php-7.3.19RC1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=517431892b292b039784c64decfb161f4a0664e9;p=php

Fix default sendmail path when not found during build

Closes GH-5548.
---

diff --git a/acinclude.m4 b/acinclude.m4
index bf4c88d3a3..a12fb862f7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2084,7 +2084,7 @@ dnl Search for the sendmail binary
 dnl
 AC_DEFUN([PHP_PROG_SENDMAIL], [
   PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
-  AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
+  AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$PHP_ALT_PATH)
   PHP_SUBST(PROG_SENDMAIL)
 ])
 
diff --git a/main/main.c b/main/main.c
index 30629117d9..f20a786743 100644
--- a/main/main.c
+++ b/main/main.c
@@ -697,10 +697,8 @@ PHP_INI_MH(OnChangeBrowscap);
  /* Windows use the internal mail */
 #if defined(PHP_WIN32)
 # define DEFAULT_SENDMAIL_PATH NULL
-#elif defined(PHP_PROG_SENDMAIL)
-# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
 #else
-# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"
+# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i"
 #endif
 
 /* {{{ PHP_INI