diff options
| author | Jeffrey Stedfast <fejj@novell.com> | 2006-04-24 15:30:02 +0000 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2006-04-24 15:30:02 +0000 |
| commit | 59f368c91a398862a7716f09411d9f66a9cc65fd (patch) | |
| tree | c538912487f43c421f7051918b66863eb471281d /camel | |
| parent | 1d083761000d6a3c195e85495e1142561484fb72 (diff) | |
| download | evolution-data-server-59f368c91a398862a7716f09411d9f66a9cc65fd.tar.gz | |
Don't do fallback for SSL/TLS. Fixes bug #321797.
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.
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/providers/imap/ChangeLog | 12 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-store.c | 9 |
2 files changed, 10 insertions, 11 deletions
diff --git a/camel/providers/imap/ChangeLog b/camel/providers/imap/ChangeLog index cedc007f2..4ec6407b1 100644 --- a/camel/providers/imap/ChangeLog +++ b/camel/providers/imap/ChangeLog @@ -1,9 +1,13 @@ +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-04-19 Sankar P <psankar@novell.com> - * camel-imap-folder.c : (imap_update_summary): - Instead of downloading HEADERS try to download - the specific HEADER FIELDS so that the initial - loading time is considerably reduced. + * camel-imap-folder.c (imap_update_summary): Instead of + downloading HEADERS try to download the specific HEADER FIELDS so + that the initial loading time is considerably reduced. 2006-01-17 Parthasarathi Susarla <sparthasarathi@novell.com> diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index f27e60097..f34375421 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -978,16 +978,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); |