See ChangeLog

Monotone-Parent: 8027e57cbf5cbb4ab2ee6bf9509fe2f571f150c1
Monotone-Revision: 0ffde732abb09a8e3d0382ed47a3ec787f25796e

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-09-14T18:33:44
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/SOGoMailBaseObject.m

@@ -160,7 +160,13 @@ static BOOL debugOn = YES;
   if (!imap4)
     {
       sogoCache = [SOGoCache sharedCache];
-      cacheKey = [[self mailAccountFolder] nameInContainer];
+      // The cacheKey *MUST* be prefixed by the username here as
+      // the cache is shared across OpenChange users and not necessarily
+      // flushed between requests. This could lead us to using the wrong
+      // IMAP connection.
+      cacheKey = [NSString stringWithFormat: @"%@+%@",
+			   [[[self context] activeUser] login],
+			   [[self mailAccountFolder] nameInContainer]];
       imap4 = [sogoCache imap4ConnectionForKey: cacheKey];
       if (!imap4)
         {

SoObjects/SOGo/SOGoObject.h

@@ -87,7 +87,9 @@
 - (void) setContext: (WOContext *) newContext;
 - (WOContext *) context;
 
+- (void) setNameInContainer: (NSString *) theName;
 - (NSString *) nameInContainer;
+
 - (NSString *) displayName;
 - (id) container;
 

SoObjects/SOGo/SOGoObject.m

@@ -209,6 +209,11 @@
   return context;
 }
 
+- (void) setNameInContainer: (NSString *) theName
+{
+  ASSIGN(nameInContainer, theName);
+}
+
 - (NSString *) nameInContainer
 {
   return nameInContainer;