diff options
| author |  Paul Young <paulyoungonline@gmail.com> | 2013-07-11 23:11:36 -0400 |
|---|---|---|
| committer | Paul Young <paulyoungonline@gmail.com> | 2013-07-11 23:11:36 -0400 |
| commit | cf546445892d3214baac50c651464ae732c76dd4 (patch) | |
| tree | 562e4b72ad176def743a1db3d7237447919b4b5e /src/core/imap/MCIMAPSession.cc | |
| parent | 90f9e57030c2c67949430b0f76d8d5396c31905a (diff) | |
| parent | b5b6994719153fe7b1c8503ef94c6971b10a5e14 (diff) | |
Merge remote-tracking branch 'upstream/master' into message-rendering-with-session
Conflicts:
build-mac/mailcore2.xcodeproj/project.pbxproj
Diffstat (limited to 'src/core/imap/MCIMAPSession.cc')
| -rw-r--r-- | src/core/imap/MCIMAPSession.cc | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc index 2b3c2baf..b44efdfd 100644 --- a/src/core/imap/MCIMAPSession.cc +++ b/src/core/imap/MCIMAPSession.cc @@ -692,76 +692,76 @@ void IMAPSession::login(ErrorCode * pError) break; case AuthTypeSASLCRAMMD5: - r = mailimap_authenticate(mImap, "CRAM-MD5", - MCUTF8(mHostname), - NULL, - NULL, - utf8username, utf8username, - utf8password, NULL); - break; + r = mailimap_authenticate(mImap, "CRAM-MD5", + MCUTF8(mHostname), + NULL, + NULL, + utf8username, utf8username, + utf8password, NULL); + break; case AuthTypeSASLPlain: - r = mailimap_authenticate(mImap, "PLAIN", - MCUTF8(mHostname), - NULL, - NULL, - utf8username, utf8username, - utf8password, NULL); - break; + r = mailimap_authenticate(mImap, "PLAIN", + MCUTF8(mHostname), + NULL, + NULL, + utf8username, utf8username, + utf8password, NULL); + break; case AuthTypeSASLGSSAPI: // needs to be tested r = mailimap_authenticate(mImap, "GSSAPI", - MCUTF8(mHostname), - NULL, - NULL, - utf8username, utf8username, - utf8password, NULL /* realm */); + MCUTF8(mHostname), + NULL, + NULL, + utf8username, utf8username, + utf8password, NULL /* realm */); break; case AuthTypeSASLDIGESTMD5: r = mailimap_authenticate(mImap, "DIGEST-MD5", - MCUTF8(mHostname), - NULL, - NULL, - utf8username, utf8username, - utf8password, NULL); + MCUTF8(mHostname), + NULL, + NULL, + utf8username, utf8username, + utf8password, NULL); break; - - case AuthTypeSASLLogin: + + case AuthTypeSASLLogin: r = mailimap_authenticate(mImap, "LOGIN", - MCUTF8(mHostname), - NULL, - NULL, - utf8username, utf8username, - utf8password, NULL); + MCUTF8(mHostname), + NULL, + NULL, + utf8username, utf8username, + utf8password, NULL); break; - - case AuthTypeSASLSRP: + + case AuthTypeSASLSRP: r = mailimap_authenticate(mImap, "SRP", - MCUTF8(mHostname), - NULL, - NULL, - utf8username, utf8username, - utf8password, NULL); + MCUTF8(mHostname), + NULL, + NULL, + utf8username, utf8username, + utf8password, NULL); break; - case AuthTypeSASLNTLM: + case AuthTypeSASLNTLM: r = mailimap_authenticate(mImap, "NTLM", - MCUTF8(mHostname), - NULL, - NULL, - utf8username, utf8username, - utf8password, NULL/* realm */); + MCUTF8(mHostname), + NULL, + NULL, + utf8username, utf8username, + utf8password, NULL/* realm */); break; - case AuthTypeSASLKerberosV4: + case AuthTypeSASLKerberosV4: r = mailimap_authenticate(mImap, "KERBEROS_V4", - MCUTF8(mHostname), - NULL, - NULL, - utf8username, utf8username, - utf8password, NULL/* realm */); + MCUTF8(mHostname), + NULL, + NULL, + utf8username, utf8username, + utf8password, NULL/* realm */); break; case AuthTypeXOAuth2: @@ -778,7 +778,7 @@ void IMAPSession::login(ErrorCode * pError) } else if (hasError(r)) { String * response; - + response = MCSTR(""); if (mImap->imap_response != NULL) { response = String::stringWithUTF8Characters(mImap->imap_response); |