diff options
| -rw-r--r-- | camel/providers/smtp/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/providers/smtp/camel-smtp-transport.c | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/camel/providers/smtp/ChangeLog b/camel/providers/smtp/ChangeLog index aaa4ef05e..5fa156f63 100644 --- a/camel/providers/smtp/ChangeLog +++ b/camel/providers/smtp/ChangeLog @@ -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 diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index 423714ebd..a52a8b286 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -431,16 +431,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); |