Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1407/src/mail
Modified Files:
LogCircle.cpp
Log Message:
recognize message cclient gives when it detects a server with bad AUTH PLAIN support
(should help diagnosing situations like in bug 621)
Index: LogCircle.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/LogCircle.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- LogCircle.cpp 12 Oct 2003 15:14:01 -0000 1.5
+++ LogCircle.cpp 19 Sep 2004 15:42:13 -0000 1.6
@@ -82,25 +82,24 @@
MLogCircle::GuessError(void) const
{
- String guess,
- err;
+ String guess;
- if ( Find(_T("No such host"), &err) )
+ if ( Find(_T("No such host")) )
{
guess = _("The server name could not be resolved "
"(maybe the network connection is down?)");
}
- else if ( Find(_T("User unknown"), &err) )
+ else if ( Find(_T("User unknown")) )
{
guess = _("One or more email addresses were not recognised.");
}
// check for various POP3 bad login/password messages
- else if ( Find(_T("authorization failed"), &err) ||
- Find(_T("password wrong"), &err) ||
- Find(_T("bad password"), &err) ||
- Find(_T("unknown user name"), &err) ||
- Find(_T("Bad authentication"), &err) ||
- Find(_T("Password supplied for"), &err) || // ... <email addr> is
incorrect
- Find(_T("Invalid password"), &err) ||
- Find(_T("Invalid login"), &err) )
+ else if ( Find(_T("authorization failed")) ||
+ Find(_T("password wrong")) ||
+ Find(_T("bad password")) ||
+ Find(_T("unknown user name")) ||
+ Find(_T("Bad authentication")) ||
+ Find(_T("Password supplied for")) || // ... <email addr> is incorrect
+ Find(_T("Invalid password")) ||
+ Find(_T("Invalid login")) )
{
guess = _("Incorrect username or password: "
@@ -108,11 +107,11 @@
}
// SMTP 554 error
- else if ( Find(_T("recipients failed"), &err) )
+ else if ( Find(_T("recipients failed")) )
{
guess = _("Mail server didn't accept one or more of the message recipients");
}
// these are generated by c-client
- else if ( Find(_T("INVALID_ADDRESS"), &err) ||
- Find(_T(".SYNTAX-ERROR."), &err) )
+ else if ( Find(_T("INVALID_ADDRESS")) ||
+ Find(_T(".SYNTAX-ERROR.")) )
{
guess = _("The message contained an invalid address specification.");
@@ -120,12 +119,12 @@
// check for various POP3 server messages telling us that another session
// is active
- else if ( Find(_T("mailbox locked"), &err) ||
- Find(_T("lock busy"), &err) ||
- Find(_T("[IN-USE]"), &err) )
+ else if ( Find(_T("mailbox locked")) ||
+ Find(_T("lock busy")) ||
+ Find(_T("[IN-USE]")) )
{
guess = _("The mailbox is already opened from another session, "
"please close it first and retry.");
}
- else if ( Find(_T("Self-signed certificate or untrusted authority"), &err) )
+ else if ( Find(_T("Self-signed certificate or untrusted authority")) )
{
guess = _("You chose not to trust the SSL certificate of this server.\n"
@@ -135,8 +134,12 @@
"want to accept self-signed certificates.");
}
-
- if ( !guess.empty() )
+ else if ( Find(_T("SMTP SERVER BUG (invalid challenge)")) )
{
- wxLogMessage(_("The exact error message was: %s"), err.c_str());
+ guess = _("SMTP server advertises support for PLAIN authorization "
+ "mechanism, but doesn't really support it.\n"
+ "\n"
+ "Please enter \"PLAIN\" in the \"Methods NOT to use\" field "
+ "of the \"Network\" page of the program options dialog and "
+ "retry");
}
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
