Index: camel/providers/imap/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/ChangeLog,v
retrieving revision 1.49
diff -u -r1.49 ChangeLog
--- camel/providers/imap/ChangeLog	16 Jan 2006 20:55:26 -0000	1.49
+++ camel/providers/imap/ChangeLog	21 Apr 2006 18:56:50 -0000
@@ -1,3 +1,8 @@
+2006-04-21  Jeffrey Stedfast  <fejj@novell.com>
+
+	* camel-imap-store.c (connect_to_server_wrapper): Don't do
+	fallback for SSL/TLS. Fixes bug #321797.
+
 2006-01-17  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
 	** See Bug #323106, #326385
Index: camel/providers/imap/camel-imap-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-store.c,v
retrieving revision 1.340.2.2
diff -u -r1.340.2.2 camel-imap-store.c
--- camel/providers/imap/camel-imap-store.c	20 Apr 2006 21:12:15 -0000	1.340.2.2
+++ camel/providers/imap/camel-imap-store.c	21 Apr 2006 18:56:51 -0000
@@ -978,16 +978,11 @@
 		camel_exception_clear (ex);
 		ai = camel_getaddrinfo(service->url->host, port, &hints, ex);
 	}
+	
 	if (ai == NULL)
 		return FALSE;
 	
-	if (!(ret = connect_to_server (service, ai, mode, ex)) && mode == MODE_SSL) {
-		camel_exception_clear (ex);
-		ret = connect_to_server (service, ai, MODE_TLS, ex);
-	} else if (!ret && mode == MODE_TLS) {
-		camel_exception_clear (ex);
-		ret = connect_to_server (service, ai, MODE_CLEAR, ex);
-	}
+	ret = connect_to_server (service, ai, mode, ex);
 	
 	camel_freeaddrinfo (ai);
 	
Index: camel/providers/imap4/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/ChangeLog,v
retrieving revision 1.23.2.2
diff -u -r1.23.2.2 ChangeLog
--- camel/providers/imap4/ChangeLog	21 Apr 2006 15:42:20 -0000	1.23.2.2
+++ camel/providers/imap4/ChangeLog	21 Apr 2006 18:56:51 -0000
@@ -2,6 +2,8 @@
 
 	* camel-imap4-store.c (connect_to_server): Set some socket options
 	like keepalive and nodelay.
+	(connect_to_server_wrapper): Don't do fallback with SSL/TLS. Fixes
+	bug #321797.
 
 2006-04-12  Jeffrey Stedfast  <fejj@novell.com>
 
Index: camel/providers/imap4/camel-imap4-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-store.c,v
retrieving revision 1.56.2.3
diff -u -r1.56.2.3 camel-imap4-store.c
--- camel/providers/imap4/camel-imap4-store.c	21 Apr 2006 15:42:20 -0000	1.56.2.3
+++ camel/providers/imap4/camel-imap4-store.c	21 Apr 2006 18:56:51 -0000
@@ -383,16 +383,11 @@
 		camel_exception_clear (ex);
 		ai = camel_getaddrinfo (service->url->host, port, &hints, ex);
 	}
+	
 	if (ai == NULL)
 		return FALSE;
 	
-	if (!(ret = connect_to_server (engine, ai, mode, ex)) && mode == MODE_SSL) {
-		camel_exception_clear (ex);
-		ret = connect_to_server (engine, ai, MODE_TLS, ex);
-	} else if (!ret && mode == MODE_TLS) {
-		camel_exception_clear (ex);
-		ret = connect_to_server (engine, ai, MODE_CLEAR, ex);
-	}
+	ret = connect_to_server (engine, ai, mode, ex);
 	
 	camel_freeaddrinfo (ai);
 	
Index: camel/providers/pop3/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/pop3/ChangeLog,v
retrieving revision 1.6
diff -u -r1.6 ChangeLog
--- camel/providers/pop3/ChangeLog	15 Sep 2005 22:28:37 -0000	1.6
+++ camel/providers/pop3/ChangeLog	21 Apr 2006 18:56:51 -0000
@@ -1,3 +1,8 @@
+2006-04-21  Jeffrey Stedfast  <fejj@novell.com>
+
+	* camel-pop3-store.c (connect_to_server_wrapper): Don't do
+	fallback for SSL/TLS. Fixes bug #321797.
+
 2005-09-16  Tor Lillqvist  <tml@novell.com>
 
 	* camel-pop3-folder.c: Use g_ascii_strcasecmp() instead of
Index: camel/providers/pop3/camel-pop3-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/pop3/camel-pop3-store.c,v
retrieving revision 1.124
diff -u -r1.124 camel-pop3-store.c
--- camel/providers/pop3/camel-pop3-store.c	31 Aug 2005 04:26:04 -0000	1.124
+++ camel/providers/pop3/camel-pop3-store.c	21 Apr 2006 18:56:51 -0000
@@ -324,16 +324,11 @@
 		camel_exception_clear (ex);
 		ai = camel_getaddrinfo(service->url->host, port, &hints, ex);
 	}
+	
 	if (ai == NULL)
 		return FALSE;
 	
-	if (!(ret = connect_to_server (service, ai, mode, ex)) && mode == MODE_SSL) {
-		camel_exception_clear (ex);
-		ret = connect_to_server (service, ai, MODE_TLS, ex);
-	} else if (!ret && mode == MODE_TLS) {
-		camel_exception_clear (ex);
-		ret = connect_to_server (service, ai, MODE_CLEAR, ex);
-	}
+	ret = connect_to_server (service, ai, mode, ex);
 	
 	camel_freeaddrinfo (ai);
 	
Index: camel/providers/smtp/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/smtp/ChangeLog,v
retrieving revision 1.2.6.1
diff -u -r1.2.6.1 ChangeLog
--- camel/providers/smtp/ChangeLog	18 Apr 2006 18:12:23 -0000	1.2.6.1
+++ camel/providers/smtp/ChangeLog	21 Apr 2006 18:56:51 -0000
@@ -1,3 +1,8 @@
+2006-04-21  Jeffrey Stedfast  <fejj@novell.com>
+
+	* camel-smtp-transport.c (connect_to_server_wrapper): Don't do
+	fallback for SSL/TLS. Fixes bug #321797.
+
 2006-04-18  Jeffrey Stedfast  <fejj@novell.com>
 
 	* camel-smtp-transport.c (smtp_helo): If the hostname isn't valid
Index: camel/providers/smtp/camel-smtp-transport.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/smtp/camel-smtp-transport.c,v
retrieving revision 1.169.6.2
diff -u -r1.169.6.2 camel-smtp-transport.c
--- camel/providers/smtp/camel-smtp-transport.c	18 Apr 2006 20:59:29 -0000	1.169.6.2
+++ camel/providers/smtp/camel-smtp-transport.c	21 Apr 2006 18:56:51 -0000
@@ -431,16 +431,11 @@
 		camel_exception_clear (ex);
 		ai = camel_getaddrinfo(service->url->host, port, &hints, ex);
 	}
+	
 	if (ai == NULL)
 		return FALSE;
 	
-	if (!(ret = connect_to_server (service, ai, mode, ex)) && mode == MODE_SSL) {
-		camel_exception_clear (ex);
-		ret = connect_to_server (service, ai, MODE_TLS, ex);
-	} else if (!ret && mode == MODE_TLS) {
-		camel_exception_clear (ex);
-		ret = connect_to_server (service, ai, MODE_CLEAR, ex);
-	}
+	ret = connect_to_server (service, ai, mode, ex);
 	
 	camel_freeaddrinfo (ai);
 	
