callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do the same SSL->TLS and TLS->CLEAR fallbacks that the 2.0 (and older)

Browse Source 
2004-11-01  Jeffrey Stedfast  <fejj@novell.com>

	* providers/smtp/camel-smtp-transport.c
	(connect_to_server_wrapper): Do the same SSL->TLS and TLS->CLEAR
	fallbacks that the 2.0 (and older) code did.

	* providers/pop3/camel-pop3-store.c (connect_to_server_wrapper): Same.

	* providers/imap4/camel-imap4-store.c (connect_to_server_wrapper): Same.

	* providers/imap/camel-imap-store.c (connect_to_server_wrapper): Same.

svn path=/trunk/; revision=27786
This commit is contained in:
Jeffrey Stedfast
2004-11-01 20:54:35 +00:00
committed by Jeffrey Stedfast
parent 4412181b30
commit 50cb220c0a
5 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
camel/ChangeLog
View File

@ -1,3 +1,15 @@
2004-11-01 Jeffrey Stedfast <fejj@novell.com>
* providers/smtp/camel-smtp-transport.c
(connect_to_server_wrapper): Do the same SSL->TLS and TLS->CLEAR
fallbacks that the 2.0 (and older) code did.
* providers/pop3/camel-pop3-store.c (connect_to_server_wrapper): Same.
* providers/imap4/camel-imap4-store.c (connect_to_server_wrapper): Same.
* providers/imap/camel-imap-store.c (connect_to_server_wrapper): Same.
2004-11-01 Jeffrey Stedfast <fejj@novell.com>
* providers/imap4/camel-imap4-summary.c

13
camel/providers/imap/camel-imap-store.c
View File

@ -872,9 +872,9 @@ static struct {
} ssl_options[] = {
{ "", "imaps", IMAPS_PORT, MODE_SSL }, /* really old (1.x) */
{ "always", "imaps", IMAPS_PORT, MODE_SSL },
{ "when-possible", "imap", IMAP_PORT, MODE_TLS },
{ "never", "imap", IMAP_PORT, MODE_CLEAR },
{ NULL, "imap", IMAP_PORT, MODE_CLEAR },
{ "when-possible", "imap", IMAP_PORT, MODE_TLS },
{ "never", "imap", IMAP_PORT, MODE_CLEAR },
{ NULL, "imap", IMAP_PORT, MODE_CLEAR },
};
static gboolean
@ -918,8 +918,11 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
}
if (ai == NULL)
return FALSE;
ret = connect_to_server (service, ai, mode, ex);
if (!(ret = connect_to_server (service, ai, mode, ex)) && mode == MODE_SSL)
ret = connect_to_server (service, ai, MODE_TLS, ex);
else if (!ret && mode == MODE_TLS)
ret = connect_to_server (service, ai, MODE_CLEAR, ex);
camel_freeaddrinfo (ai);

5
camel/providers/imap4/camel-imap4-store.c
View File

@ -351,7 +351,10 @@ connect_to_server_wrapper (CamelIMAP4Engine *engine, CamelException *ex)
if (ai == NULL)
return FALSE;
ret = connect_to_server (engine, ai, mode, ex);
if (!(ret = connect_to_server (engine, ai, mode, ex)) && mode == MODE_SSL)
ret = connect_to_server (engine, ai, MODE_TLS, ex);
else if (!ret && mode == MODE_TLS)
ret = connect_to_server (engine, ai, MODE_CLEAR, ex);
camel_freeaddrinfo (ai);

5
camel/providers/pop3/camel-pop3-store.c
View File

@ -319,7 +319,10 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
if (ai == NULL)
return FALSE;
ret = connect_to_server (service, ai, mode, ex);
if (!(ret = connect_to_server (service, ai, mode, ex)) && mode == MODE_SSL)
ret = connect_to_server (service, ai, MODE_TLS, ex);
else if (!ret && mode == MODE_TLS)
ret = connect_to_server (service, ai, MODE_CLEAR, ex);
camel_freeaddrinfo (ai);

5
camel/providers/smtp/camel-smtp-transport.c
View File

@ -427,7 +427,10 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
if (ai == NULL)
return FALSE;
ret = connect_to_server (service, ai, mode, ex);
if (!(ret = connect_to_server (service, ai, mode, ex)) && mode == MODE_SSL)
ret = connect_to_server (service, ai, MODE_TLS, ex);
else if (!ret && mode == MODE_TLS)
ret = connect_to_server (service, ai, MODE_CLEAR, ex);
camel_freeaddrinfo (ai);