From 451ecde5c915d94fdb6c5c8e59b291868290bc14 Mon Sep 17 00:00:00 2001 From: "mguessan@free.fr" Date: Tue, 3 Sep 2019 13:05:31 +0200 Subject: Send FQDN instead of simple hostname in SMTP HELO command This closes #101 pull request at github/apache/ant repo --- src/main/org/apache/tools/mail/MailMessage.java | 2 +- src/tests/junit/org/apache/tools/mail/MailMessageTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java index bb16c48f7..48b155059 100644 --- a/src/main/org/apache/tools/mail/MailMessage.java +++ b/src/main/org/apache/tools/mail/MailMessage.java @@ -393,7 +393,7 @@ public class MailMessage { } void sendHelo() throws IOException { - String local = InetAddress.getLocalHost().getHostName(); + String local = InetAddress.getLocalHost().getCanonicalHostName(); int[] ok = {OK_HELO}; send("HELO " + local, ok); } diff --git a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java index 944e8897d..72ee1fa19 100644 --- a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java +++ b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java @@ -44,7 +44,7 @@ public class MailMessageTest { @Before public void setUp() { try { - local = InetAddress.getLocalHost().getHostName(); + local = InetAddress.getLocalHost().getCanonicalHostName(); } catch (java.net.UnknownHostException uhe) { // ignore } -- cgit v1.2.1