From 736437670a666b39b4a2416e4361f0e983f371de Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Thu, 10 Sep 2009 13:20:55 +0000
Subject: [PATCH] LDAP: copy uid to apple-generateduid for iCal attendee search

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

diff --git a/src/java/davmail/ldap/LdapConnection.java b/src/java/davmail/ldap/LdapConnection.java
index d3c621e1..49656c3f 100644
--- a/src/java/davmail/ldap/LdapConnection.java
+++ b/src/java/davmail/ldap/LdapConnection.java
@@ -786,17 +786,21 @@ public class LdapConnection extends AbstractConnection {
                     }
                 }
             } else {
+                // iCal: copy uid to apple-generateduid
+                if (returningAttributes.contains("apple-generateduid") && person.get("uid") != null) {
+                    person.put("apple-generateduid", person.get("uid"));
+                }
                 // convert Contact entries
                 for (Map.Entry<String, String> entry : person.entrySet()) {
                     String contactAttribute = entry.getKey();
                     // get converted attribute name
                     String ldapAttribute = CONTACT_ATTRIBUTE_MAP.get(contactAttribute);
                     // no conversion, use exchange attribute name
-                    if (ldapAttribute == null){
+                    if (ldapAttribute == null) {
                         ldapAttribute = contactAttribute;
                     }
                     String value = entry.getValue();
-                     if (value != null
+                    if (value != null
                             && (returnAllAttributes || returningAttributes.contains(ldapAttribute.toLowerCase()))) {
                         ldapPerson.put(ldapAttribute, value);
                     }