From 93b569ab9ad74b69c1f6e897b78542257b914f52 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Mon, 17 Aug 2009 09:48:04 +0000 Subject: [PATCH] Safety check in the LDAP code and updated NEWS file. Monotone-Parent: 7d3f8a6489b3a967cd9f80005b5e2fff462c1801 Monotone-Revision: cd7b1310c287fec8f03fa7a5432b1fc774378ea1 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-08-17T09:48:04 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ NEWS | 5 +++++ SoObjects/SOGo/LDAPSource.m | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c01bf69e..0a0878069 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-08-17 Ludovic Marcotte + + * SoObjects/SOGo/LDAPSource.m + Safety check in case no objectClass attribute is returned + from the LDAP server + * Updated NEWS file + 2009-08-14 Francis Lachapelle * UI/AdministrationUI/UIxAdministration.m: new administration diff --git a/NEWS b/NEWS index 648bc0ad2..371d0b586 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +1.0-2009xxxx (1.0.5) +-------------------- +- added backup/restore tools for all user's data (calendars, address books, preferences, etc.) +- added Web administrative interface (right now, only for ACLs) + 1.0-20090812 (1.0.4) -------------------- - added ability to create and modify event categories in the preferences diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m index 9619e8743..47bf15e63 100644 --- a/SoObjects/SOGo/LDAPSource.m +++ b/SoObjects/SOGo/LDAPSource.m @@ -661,8 +661,10 @@ static NSLock *lock; contactEntry = [NSMutableDictionary dictionary]; [contactEntry setObject: [ldapEntry dn] forKey: @"dn"]; - [contactEntry setObject: [ldapEntry objectClasses] - forKey: @"objectClasses"]; + + if ([ldapEntry objectClasses]) + [contactEntry setObject: [ldapEntry objectClasses] + forKey: @"objectClasses"]; attributes = [[self _searchAttributes] objectEnumerator]; while ((currentAttribute = [attributes nextObject])) {