MFH: Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo)

# Note, this does not go in 5.2 because the inet ports for VC6 are not in that branch

diff --git a/NEWS b/NEWS
index 9897ea729bd294ac688b7ad3eb69c3e5fb209cba..ddd935b987c41d9ce6543c335ee4de0e61634ed4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,10 @@
-PHP                                                                        NEWS
+PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2009, PHP 5.3.1
 
+- Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo). 
+  (Kalle, Rick Yorgason)
+
 
 30 Jun 2009, PHP 5.3.0
 - Upgraded bundled PCRE to version 7.9. (Nuno)

diff --git a/win32/sendmail.c b/win32/sendmail.c
index 85af4d923f11a3971600946e2b65f3181efb572a..bd84dac8b90773c03ac4fc2af43c52a4f5a0827e 100644 (file)
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -37,6 +37,7 @@
 #endif /* NETWARE */
 #include "sendmail.h"
 #include "php_ini.h"
+#include "inet.h"
 
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
 #include "ext/pcre/php_pcre.h"
@@ -765,16 +766,52 @@ PostHeader_outofmem:
 static int MailConnect()
 {
 
-       int res;
+       int res, namelen;
        short portnum;
+       struct hostent *ent;
+       IN_ADDR addr;
+#ifdef HAVE_IPV6
+       IN6_ADDR addr6;
+#endif
 
        /* Create Socket */
-       if ((sc = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
+       if ((sc = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
                return (FAILED_TO_OBTAIN_SOCKET_HANDLE);
+       }
 
        /* Get our own host name */
-       if (gethostname(LocalHost, HOST_NAME_LEN))
+       if (gethostname(LocalHost, HOST_NAME_LEN)) {
+               return (FAILED_TO_GET_HOSTNAME);
+       }
+
+       ent = gethostbyname(LocalHost);
+
+       if (!ent) {
                return (FAILED_TO_GET_HOSTNAME);
+       }
+
+       namelen = strlen(ent->h_name);
+
+#ifdef HAVE_IPV6
+       if (inet_pton(AF_INET, ent->h_name, &addr) == 1 || inet_pton(AF_INET6, ent->h_name, &addr6) == 1)
+#else
+       if (inet_pton(AF_INET, ent->h_name, &addr) == 1)
+#endif
+       {
+               if (namelen + 2 >= HOST_NAME_LEN) {
+                       return (FAILED_TO_GET_HOSTNAME);
+               }
+
+               strcpy(LocalHost, "[");
+               strcpy(LocalHost + 1, ent->h_name);
+               strcpy(LocalHost + namelen + 1, "]");
+       } else {
+               if (namelen >= HOST_NAME_LEN) {
+                       return (FAILED_TO_GET_HOSTNAME);
+               }
+
+               strcpy(LocalHost, ent->h_name);
+       }
 
        /* Resolve the servers IP */
        /*
@@ -794,8 +831,9 @@ static int MailConnect()
        sock_in.sin_port = htons(portnum);
        sock_in.sin_addr.S_un.S_addr = GetAddr(MailHost);
 
-       if (connect(sc, (LPSOCKADDR) & sock_in, sizeof(sock_in)))
+       if (connect(sc, (LPSOCKADDR) & sock_in, sizeof(sock_in))) {
                return (FAILED_TO_CONNECT);
+       }
 
        /* receive Server welcome message */
        res = Ack(NULL);