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

1 files changed, 42 insertions, 4 deletions

diff --git a/win32/sendmail.c b/win32/sendmail.c
index 85af4d923f..bd84dac8b9 100644
--- 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);