From 6f0cc7502d712165b46acc589d53a2f995149ccc Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 23 Aug 2012 16:51:24 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: ec64b102b590c4a7b217fe508a46ad302e12adce Monotone-Revision: 28a7f739364a5ec7c2076aea5f8a59c6910c4727 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-08-23T16:51:24 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/Mailer/SOGoMailFolder.m | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6ebfc2314..9ec30eb61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-08-23 Ludovic Marcotte + + * SoObjects/Mailer/SOGoMailFolder.m - added safety + checks around the ACL code so we don't crash if + we can't read the ACLs. + 2012-08-21 Wolfgang Sourdeau * OpenChange/MAPIStoreFolder.m (-getPidTagAccessLevel) diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index 1bf4c6a30..5e6348bde 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -1171,6 +1171,9 @@ static NSString *defaultUserID = @"anyone"; NSEnumerator *usernames; NSString *username; + if ([mailboxACL isKindOfClass: [NSException class]]) + return; + newIMAPAcls = [NSMutableDictionary new]; usernames = [[mailboxACL allKeys] objectEnumerator]; @@ -1193,6 +1196,9 @@ static NSString *defaultUserID = @"anyone"; NSString *newUsername; NSString *imapPrefix; + if ([mailboxACL isKindOfClass: [NSException class]]) + return; + imapPrefix = [[[context activeUser] domainDefaults] imapAclGroupIdPrefix]; newIMAPAcls = [[NSMutableDictionary alloc] init];