From cee94feb0592fd98e528fbce3611022316448ea0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 20 Sep 2010 13:56:29 +0000 Subject: [PATCH] Monotone-Parent: e44f8ed7f2cb0a7509257497630e18c476b9b901 Monotone-Revision: 1acff2251868501e5baba3465e49475362ce1e4b Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-09-20T13:56:29 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/SOGo/LDAPSource.m | 1 + 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 187cbc1c5..96b922248 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-09-20 Wolfgang Sourdeau + * SoObjects/SOGo/LDAPSource.m (-_searchAttributes): added + "IDField" to the search attributes for constructing addressbook + entries with a valid "c_name". + * Tests/Integration/test-davacl.py (DAVCalendarPublicAclTest.testCollectionAccessNormalUser): make use of the fix below when removing the rights for the subscriber diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m index 814913637..0d00be080 100644 --- a/SoObjects/SOGo/LDAPSource.m +++ b/SoObjects/SOGo/LDAPSource.m @@ -628,6 +628,7 @@ static NSArray *commonSearchFields; [searchAttributes addObjectsFromArray: mailFields]; [searchAttributes addObjectsFromArray: [self _constraintsFields]]; [searchAttributes addObjectsFromArray: commonSearchFields]; + [searchAttributes addObjectUniquely: IDField]; // Add SOGoLDAPContactInfoAttribute from user defaults if ([contactInfoAttribute length])