[evolution-patches] fix for bug #50535

[Jeffrey Stedfast <fejj ximian com>]

http://bugzilla.ximian.com/show_bug.cgi?id=50535

only happens if the server advertises that it supports ESMTP in the
greeting, in which case we didn't fall back to normal HELO operation if
EHLO failed. we just ignored the error.

Jeff

-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.1836.2.20
diff -u -r1.1836.2.20 ChangeLog
--- ChangeLog	4 Nov 2003 21:42:59 -0000	1.1836.2.20
+++ ChangeLog	5 Nov 2003 22:22:10 -0000
@@ -1,3 +1,15 @@
+2003-11-05  Jeffrey Stedfast  <fejj ximian com>
+
+	* providers/smtp/camel-smtp-transport.c (connect_to_server): Don't
+	bother trying to see if the server advertises EHLO. Simply always
+	try EHLO and fall back to HELO if EHLO fails. Fixes bug #50535.
+
+2003-11-04  Jeffrey Stedfast  <fejj ximian com>
+
+	* camel-gpg-context.c (gpg_ctx_parse_status): We might need to
+	convert the passwd from UTF-8 into the locale charset. Fixes bug
+	#50485.
+
 2003-10-28  Frederic Crozat  <fcrozat mandrakesoft com>
 
 	* camel-mime-utils.c (header_decode_date): better detection of
Index: providers/smtp/camel-smtp-transport.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/smtp/camel-smtp-transport.c,v
retrieving revision 1.138.4.1
diff -u -r1.138.4.1 camel-smtp-transport.c
--- providers/smtp/camel-smtp-transport.c	26 Sep 2003 16:04:50 -0000	1.138.4.1
+++ providers/smtp/camel-smtp-transport.c	5 Nov 2003 22:22:11 -0000
@@ -300,27 +300,18 @@
 			g_free (respbuf);
 			return FALSE;
 		}
-		if (strstr (respbuf, "ESMTP"))
-			transport->flags |= CAMEL_SMTP_TRANSPORT_IS_ESMTP;
 	} while (*(respbuf+3) == '-'); /* if we got "220-" then loop again */
 	g_free (respbuf);
 	
-	/* send EHLO (or HELO, depending on the service type) */
-	if (!(transport->flags & CAMEL_SMTP_TRANSPORT_IS_ESMTP)) {
-		/* If we did not auto-detect ESMTP, we should still send EHLO */
-		transport->flags |= CAMEL_SMTP_TRANSPORT_IS_ESMTP;
-		if (!smtp_helo (transport, ex)) {
-			if (!transport->connected)
-				return FALSE;
-			
-			/* Okay, apprently this server doesn't support ESMTP */
-			camel_exception_clear (ex);
-			transport->flags &= ~CAMEL_SMTP_TRANSPORT_IS_ESMTP;
-			if (!smtp_helo (transport, ex) && !transport->connected)
-				return FALSE;
-		}
-	} else {
-		/* send EHLO */
+	/* Try sending EHLO */
+	transport->flags |= CAMEL_SMTP_TRANSPORT_IS_ESMTP;
+	if (!smtp_helo (transport, ex)) {
+		if (!transport->connected)
+			return FALSE;
+		
+		/* Fall back to HELO */
+		camel_exception_clear (ex);
+		transport->flags &= ~CAMEL_SMTP_TRANSPORT_IS_ESMTP;
 		if (!smtp_helo (transport, ex) && !transport->connected)
 			return FALSE;
 	}