From f6e7d5c3a7fefce0e3ccebaed30aecc2c68320ff Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 30 Jun 2008 14:15:42 +0000 Subject: [PATCH] Monotone-Parent: dce96f1e164f7e8d2e52f854cb9287574b9ded6d Monotone-Revision: a0b176b29a24b7fe33ae8e1eb04d9838a299deaa Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-06-30T14:15:42 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 9 +++++++++ SoObjects/Contacts/SOGoContactLDAPFolder.m | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1ace0efc7..da035913c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-06-30 Wolfgang Sourdeau + + * SoObjects/Contacts/SOGoContactLDAPFolder.m + ([SOGoContactLDAPFolder + -lookupName:objectNameinContext:lookupContextacquire:acquire]): + use lookupContactentryWithUIDorEmail to make sure we use the ID + field specified in the user defaults to match the username, and + that the users can be found using their email. + 2008-06-27 Wolfgang Sourdeau * SoObjects/Appointments/SOGoFreeBusyObject.m ([SOGoFreeBusyObject diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m index ce1253360..e01d08af5 100644 --- a/SoObjects/Contacts/SOGoContactLDAPFolder.m +++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m @@ -164,7 +164,7 @@ if (!obj) { - ldifEntry = [ldapSource lookupContactEntry: objectName]; + ldifEntry = [ldapSource lookupContactEntryWithUIDorEmail: objectName]; obj = ((ldifEntry) ? [SOGoContactLDIFEntry contactEntryWithName: objectName withLDIFEntry: ldifEntry