Some Exchange server (stand-alone) return MAPI_E_LOGON_FAILED when setting EssDN...

using profile's mailbox string directly. This commit fixes the bug.

diff --git a/libmapi/IMAPISession.c b/libmapi/IMAPISession.c
index 7cb75a06cfd12e7db88124d7b424eeb5f61782ef..0ae9c5922832aebf3daa66d78c73ac7b36d73635 100644 (file)
--- a/libmapi/IMAPISession.c
+++ b/libmapi/IMAPISession.c
@@ -163,7 +163,8 @@ _PUBLIC_ enum MAPISTATUS OpenMsgStore(struct mapi_session *session,
        retval = OpenUserMailbox(session, session->profile->username, obj_store);
 
        /* Exchange clustered case */
-       if ((retval != MAPI_E_SUCCESS) && (GetLastError() == ecUnknownUser)) {
+       if ((retval != MAPI_E_SUCCESS) && 
+           ((GetLastError() == ecUnknownUser) || (GetLastError() == MAPI_E_LOGON_FAILED))) {
                errno = 0;
                retval = OpenUserMailbox(session, NULL, obj_store);
        }