moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-14 11:42:23 -05:00
Code Issues Releases Wiki Activity

LDAP: fix galfind search: add uid in response and use cn in fullsearch filter

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1529 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-11-07 22:38:27 +00:00
parent 112a744216
commit 89bc774493
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/davmail/exchange/ews/EwsExchangeSession.java
View File

@ -1691,6 +1691,7 @@ public class EwsExchangeSession extends ExchangeSession {
Contact contact = new Contact(); Contact contact = new Contact();
contact.setName(response.get("Name")); contact.setName(response.get("Name"));
contact.put("imapUid", response.get("Name")); contact.put("imapUid", response.get("Name"));
contact.put("uid", response.get("Name"));
if (LOGGER.isDebugEnabled()) { if (LOGGER.isDebugEnabled()) {
for (String key : response.keySet()) { for (String key : response.keySet()) {
if (!IGNORE_ATTRIBUTE_SET.contains(key) && !GALFIND_ATTRIBUTE_MAP.containsValue(key)) { if (!IGNORE_ATTRIBUTE_SET.contains(key) && !GALFIND_ATTRIBUTE_MAP.containsValue(key)) {

2
src/java/davmail/ldap/LdapConnection.java
View File

@ -1369,7 +1369,7 @@ public class LdapConnection extends AbstractConnection {
// full search // full search
for (char c = 'A'; c <= 'Z'; c++) { for (char c = 'A'; c <= 'Z'; c++) {
if (!abandon && persons.size() < sizeLimit) { if (!abandon && persons.size() < sizeLimit) {
for (ExchangeSession.Contact person : session.galFind(session.startsWith("imapUid", String.valueOf(c)), for (ExchangeSession.Contact person : session.galFind(session.startsWith("cn", String.valueOf(c)),
convertLdapToContactReturningAttributes(returningAttributes), sizeLimit).values()) { convertLdapToContactReturningAttributes(returningAttributes), sizeLimit).values()) {
persons.put(person.get("uid"), person); persons.put(person.get("uid"), person);
if (persons.size() == sizeLimit) { if (persons.size() == sizeLimit) {