From baa5dcb8145c95591629a1789807e1f4e85cbcba Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Wed, 7 Oct 2009 22:08:05 +0000
Subject: [PATCH] LDAP: fix for iCal4 attendee completion,  send localhost if
 current socket is local, else send fully qualified domain name

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@772 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/ldap/LdapConnection.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/java/davmail/ldap/LdapConnection.java b/src/java/davmail/ldap/LdapConnection.java
index fcb45d7e..eb5c7189 100644
--- a/src/java/davmail/ldap/LdapConnection.java
+++ b/src/java/davmail/ldap/LdapConnection.java
@@ -861,8 +861,13 @@ public class LdapConnection extends AbstractConnection {
     }
 
     protected String hostName() throws UnknownHostException {
-        // TODO: send multiple computer context with getHostName and getCanonicalHostName
-        return InetAddress.getLocalHost().getCanonicalHostName();
+        if (client.getInetAddress().isLoopbackAddress()) {
+            // local address, probably using localhost in iCal URL
+            return "localhost";
+        } else {
+            // remote address, send fully qualified domain name
+            return InetAddress.getLocalHost().getCanonicalHostName();
+        }
     }
 
     /**