mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-14 18:51:28 +00:00
don't use cram-md5 for imap unless use secure auth is turned on, patch by ch.ey@gmx.net, sr=me 231303, and back out my previous fix for this bug in favour of ch.ey's fix
This commit is contained in:
parent
b35fce94e4
commit
7a6a1c91f9
@ -4739,7 +4739,7 @@ void nsImapProtocol::AuthLogin(const char *userName, const char *password, eIMAP
|
||||
char * currentCommand=nsnull;
|
||||
nsresult rv;
|
||||
|
||||
if (m_useSecAuth && flag & kHasCRAMCapability)
|
||||
if (flag & kHasCRAMCapability)
|
||||
{
|
||||
nsresult rv;
|
||||
char *digest;
|
||||
@ -7048,8 +7048,10 @@ PRBool nsImapProtocol::TryToLogon()
|
||||
break;
|
||||
}
|
||||
|
||||
// try to use CRAM before we fall back to plain or auth login....
|
||||
if (GetServerStateParser().GetCapabilityFlag() & kHasCRAMCapability)
|
||||
// Use CRAM only if secure auth is enabled. This is for servers that
|
||||
// say they support CRAM but are so badly broken that trying it causes
|
||||
// all subsequent login attempts to fail (bug 231303, bug 227560)
|
||||
if (m_useSecAuth && GetServerStateParser().GetCapabilityFlag() & kHasCRAMCapability)
|
||||
{
|
||||
AuthLogin (userName, password, kHasCRAMCapability);
|
||||
logonTries++;
|
||||
|
Loading…
Reference in New Issue
Block a user