[geary/wip/721570-smtp-auth: 7/8] Most likely fix for bug #722381, reverted other change



commit 4b4d30c59c1f19658ac1ce079e5ca0e147da31df
Author: Jim Nelson <jim yorba org>
Date:   Fri Jan 17 17:30:19 2014 -0800

    Most likely fix for bug #722381, reverted other change

 src/engine/smtp/smtp-client-session.vala      |    7 -------
 src/engine/smtp/smtp-plain-authenticator.vala |    1 -
 2 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/src/engine/smtp/smtp-client-session.vala b/src/engine/smtp/smtp-client-session.vala
index 63f8e70..573b844 100644
--- a/src/engine/smtp/smtp-client-session.vala
+++ b/src/engine/smtp/smtp-client-session.vala
@@ -104,13 +104,6 @@ public class Geary.Smtp.ClientSession {
             Response response = yield cx.authenticate_async(authenticator, cancellable);
             if (response.code.is_success_completed())
                 return authenticator;
-            
-            // syntax errors indicate the command was unknown or unimplemented, i.e. unavailable
-            // authentication type, so try again, otherwise treat as authentication failure
-            /*
-            if (!response.code.is_syntax_error())
-                break;
-            */
         } while (auth_order.size > 0);
         
         throw new SmtpError.AUTHENTICATION_FAILED("Unable to authenticate with %s", to_string());
diff --git a/src/engine/smtp/smtp-plain-authenticator.vala b/src/engine/smtp/smtp-plain-authenticator.vala
index dc6382c..d7d13b9 100644
--- a/src/engine/smtp/smtp-plain-authenticator.vala
+++ b/src/engine/smtp/smtp-plain-authenticator.vala
@@ -30,7 +30,6 @@ public class Geary.Smtp.PlainAuthenticator : Geary.Smtp.AbstractAuthenticator {
         growable.append(credentials.user.data);
         growable.append(nul);
         growable.append((credentials.pass ?? "").data);
-        growable.append(nul);
         
         // convert to Base64
         return new Memory.StringBuffer(Base64.encode(growable.get_bytes().get_data()));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]