merge of '4d3351a8b6b27006c2727b36d6fae250d5c24d40'

and 'fbe3cd1ce788185ea42f3ac4b3238f48a16821ad'

Monotone-Parent: 4d3351a8b6b27006c2727b36d6fae250d5c24d40
Monotone-Parent: fbe3cd1ce788185ea42f3ac4b3238f48a16821ad
Monotone-Revision: 6c665d10d66699c41ab79b02a4b7703765bc6d2a

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-12-23T21:40:56
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2009-12-23 21:40:56 +00:00
commit 35251494f2
3 changed files with 7 additions and 2 deletions

View File

@ -19,6 +19,10 @@
created upon access to the calendar or address book module.
This fixes: http://www.scalableogo.org/bugs/view.php?id=208
* SoObjects/SOGo/NSDictionary+Utilities.m (-userRecordAsLDIFEntry)
We skip the "isGroup" attribute from the list of attributes
to include during LDIF generation
2009-12-22 Ludovic Marcotte <lmarcotte@inverse.ca>
* Removed all the Kolab-related stuff (more specifically,

View File

@ -171,7 +171,8 @@
|| [currentKey isEqualToString: @"ContactAccess"]
|| [currentKey hasPrefix: @"objectClass"]
|| [currentKey hasPrefix: @"c_"]
|| [currentKey isEqualToString: @"dn"]))
|| [currentKey isEqualToString: @"dn"]
|| [currentKey isEqualToString: @"isGroup"]))
[self _appendLDIFKey: currentKey toString: ldifString];
}

View File

@ -1,6 +1,6 @@
/* NSString+Utilities.m - this file is part of SOGo
*
* Copyright (C) 2006-2008 Inverse inc.
* Copyright (C) 2006-2009 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*