fallback to HELO even if SMTP AUTH enabled: bug 67538 r=bryner sr=mscott

mailnews/compose/src/nsSmtpProtocol.cpp

@@ -713,9 +713,7 @@ PRInt32 nsSmtpProtocol::SendEhloResponse(nsIInputStream * inputStream, PRUint32
     {
       /* EHLO must not be implemented by the server so fall back to the HELO case */
 
-        if (m_prefAuthMethod == PREF_AUTH_ANY ||
-            m_prefAuthMethod == PREF_AUTH_LOGIN ||
-            m_prefTrySSL == PREF_SSL_ALWAYS)
+        if (m_prefTrySSL == PREF_SSL_ALWAYS)
         {
             m_nextState = SMTP_ERROR_DONE;
             m_urlErrorState = NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER;
@@ -823,8 +821,7 @@ PRInt32 nsSmtpProtocol::ProcessAuth()
         }
         if ((TestFlag(SMTP_AUTH_PLAIN_ENABLED) ||
              TestFlag(SMTP_AUTH_LOGIN_ENABLED)) &&
-            (m_prefAuthMethod == PREF_AUTH_ANY ||
-             m_prefAuthMethod == PREF_AUTH_LOGIN))
+            (m_prefAuthMethod == PREF_AUTH_ANY))
         {
             m_nextState = SMTP_SEND_AUTH_LOGIN_USERNAME;
             m_nextStateAfterResponse = SMTP_AUTH_LOGIN_RESPONSE;
@@ -1757,7 +1754,7 @@ NS_IMETHODIMP nsSmtpProtocol::OnLogonRedirectionReply(const PRUnichar * aHost, u
   // currently the account manager isn't properly setting the authMethod
   // preference for servers which require redirectors. This is another 
   // HACK ALERT....we'll force it to be set...
-  m_prefAuthMethod = PREF_AUTH_LOGIN;
+  m_prefAuthMethod = PREF_AUTH_ANY;
 
   // now that we have a host and port to connect to, 
   // open up the channel...

mailnews/compose/src/nsSmtpProtocol.h

@@ -88,8 +88,7 @@ SMTP_AUTH_PROCESS_STATE                             // 21
 
 typedef enum _PrefAuthMethod {
     PREF_AUTH_NONE = 0,
-    PREF_AUTH_ANY = 1,
-    PREF_AUTH_LOGIN = 2
+    PREF_AUTH_ANY = 1
 } PrefAuthMethod;
 
 typedef enum _PrefTrySSL {

mailnews/mailnews.js

@@ -277,7 +277,7 @@ pref("mail.server.default.dual_use_folders", true);
 pref("mail.server.default.canDelete", false);
 pref("mail.server.default.login_at_startup", false);
 
-pref("mail.smtpserver.default.auth_method", 2); // auth login
+pref("mail.smtpserver.default.auth_method", 1); // auth any
 pref("mail.smtpserver.default.try_ssl", 1);
 
 pref("mail.display_glyph", true);   // see <http://www.bucksch.org/1/projects/mozilla/16507>

modules/libpref/src/init/mailnews.js

@@ -277,7 +277,7 @@ pref("mail.server.default.dual_use_folders", true);
 pref("mail.server.default.canDelete", false);
 pref("mail.server.default.login_at_startup", false);
 
-pref("mail.smtpserver.default.auth_method", 2); // auth login
+pref("mail.smtpserver.default.auth_method", 1); // auth any
 pref("mail.smtpserver.default.try_ssl", 1);
 
 pref("mail.display_glyph", true);   // see <http://www.bucksch.org/1/projects/mozilla/16507>