- #42505, new sendmail default path breaks on Novell (Guenter Knauf)

diff --git a/NEWS b/NEWS
index fff96d0f4bfeb3001a55036c5a534363e31d7440..c739557977dcecd344427028760062ea4a722666 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ PHP                                                                        NEWS
 - Fixed bug #44306 (Better detection of MIPS processors on Windows). (Ilia)
 - Fixed bug #44166 (Parameter handling flaw in PDO::getAvailableDrivers()).
   (Ilia)
+- Fixed bug #42505 (new sendmail default breaks on Netware platform) 
+  (Guenter Knauf)
 
 27 Feb 2008, PHP 5.2.6RC1
 - Fixed security issue detailed in CVE-2008-0599. (Rasmus)

diff --git a/main/main.c b/main/main.c
index 02dddbca035e4e4c3e0d5b6396764d757ba271fc..685fa9d7d35d1cb4aa54592f4e287efdf5f3bb19 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -352,9 +352,8 @@ static PHP_INI_MH(OnChangeMailForceExtra)
 #      define PHP_SAFE_MODE_EXEC_DIR ""
 #endif
 
-#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE)
-#      define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
-#elif defined(PHP_WIN32)
+/* Windows and Netware use the internal mail */
+#if defined(PHP_WIN32) || defined(NETWARE)
 #      define DEFAULT_SENDMAIL_PATH NULL
 #else
 #      define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"