summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormguessan@free.fr <gdeYUExU5NGUKyzpdORa>2019-09-03 13:05:31 +0200
committerJaikiran Pai <jaikiran@apache.org>2019-09-14 17:36:21 +0530
commit451ecde5c915d94fdb6c5c8e59b291868290bc14 (patch)
tree87e7a23faea889590bde41ccb96ff0b1223309f8 /src
parent2d221de4c1e99f0738be86b76862bb4968bb5c54 (diff)
downloadant-451ecde5c915d94fdb6c5c8e59b291868290bc14.tar.gz
Send FQDN instead of simple hostname in SMTP HELO command
This closes #101 pull request at github/apache/ant repo
Diffstat (limited to 'src')
-rw-r--r--src/main/org/apache/tools/mail/MailMessage.java2
-rw-r--r--src/tests/junit/org/apache/tools/mail/MailMessageTest.java2
2 files changed, 2 insertions, 2 deletions
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
}