diff options
| author | Jeffrey Stedfast <fejj@novell.com> | 2006-04-24 15:31:13 +0000 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2006-04-24 15:31:13 +0000 |
| commit | 95db4ad96ad0bc1b3006e392c18f20d7498ce37b (patch) | |
| tree | 5d4a669aa21b07405191e9c4b641b1253d78e227 /camel | |
| parent | 607ca9d4dde78b6dbb18b314f199cbe18bd5a690 (diff) | |
| download | evolution-data-server-95db4ad96ad0bc1b3006e392c18f20d7498ce37b.tar.gz | |
Don't do fallback for SSL/TLS. Fixes bug #321797.
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.
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/providers/pop3/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/camel/providers/pop3/ChangeLog b/camel/providers/pop3/ChangeLog index 5d27e0ec1..cc0a259e9 100644 --- a/camel/providers/pop3/ChangeLog +++ b/camel/providers/pop3/ChangeLog @@ -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 diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index de8214297..9412f6bc6 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -324,16 +324,11 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex) 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); |