moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-25 15:11:52 -05:00
Code Issues Releases Wiki Activity

Use a real hostname rather than localhost.localdomain.

Browse Source 
Fixes Issue 45

Patch by cketti
This commit is contained in:
Jesse Vincent 2010-02-02 02:06:35 +00:00
parent a58095aae1
commit 74aac85048
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/fsck/k9/mail/transport/SmtpTransport.java
View File

@ -173,23 +173,13 @@ public class SmtpTransport extends Transport
// Eat the banner // Eat the banner
executeSimpleCommand(null); executeSimpleCommand(null);
String localHost = "localhost.localdomain"; InetAddress localAddress = mSocket.getLocalAddress();
try String localHost = localAddress.getHostName();
if (localHost.equals(localAddress.getHostAddress()))
{ {
InetAddress localAddress = InetAddress.getLocalHost(); // IP was returned
if (! localAddress.isLoopbackAddress()) localHost = "[" + localHost + "]";
{
// The loopback address will resolve to 'localhost'
// some mail servers only accept qualified hostnames, so make sure
// never to override "localhost.localdomain" with "localhost"
// TODO - this is a hack. but a better hack than what was there before
localHost = localAddress.getHostName();
}
}
catch (Exception e)
{
if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Unable to look up localhost");
} }
List<String> results = executeSimpleCommand("EHLO " + localHost); List<String> results = executeSimpleCommand("EHLO " + localHost);