diff options
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/providers/smtp/camel-smtp-transport.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index f7a7ddf80c..3932d47e10 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2000-11-28 Jeffrey Stedfast <fejj@helixcode.com> + + * providers/smtp/camel-smtp-transport.c (smtp_connect): Clear the + exception if EHLO fails before trying HELO in the cases where the + SMTP provider doesn't announce its ESMTPness. + 2000-11-28 Not Zed <NotZed@HelixCode.com> * providers/local/camel-maildir-summary.c diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index df70d48baf..7fe0aa5384 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -200,10 +200,12 @@ smtp_connect (CamelService *service, CamelException *ex) transport->is_esmtp = TRUE; if (!smtp_helo (transport, ex)) { /* Okay, apprently this server doesn't support ESMTP */ + camel_exception_clear (ex); transport->is_esmtp = FALSE; smtp_helo (transport, ex); } } else { + /* send EHLO */ smtp_helo (transport, ex); } |