Commit b66ffedc b66ffedcecf7506efc8631dfe1047c0a1d28af80 by Sergey Poznyakoff

Bugfix.

* libproto/mailer/smtp.c (smtp_open): Don't issue second
EHLO if STARTTLS failed.
1 parent 34bbf3cc
...@@ -488,12 +488,9 @@ smtp_open (mu_mailer_t mailer, int flags) ...@@ -488,12 +488,9 @@ smtp_open (mu_mailer_t mailer, int flags)
488 488
489 case SMTP_STARTTLS: 489 case SMTP_STARTTLS:
490 case SMTP_STARTTLS_ACK: 490 case SMTP_STARTTLS_ACK:
491 if (smtp->capa & CAPA_STARTTLS) 491 if ((smtp->capa & CAPA_STARTTLS) && smtp_starttls (smtp) == 0)
492 { 492 goto ehlo;
493 smtp_starttls (smtp); 493
494 goto ehlo;
495 }
496
497 case SMTP_AUTH: 494 case SMTP_AUTH:
498 case SMTP_AUTH_ACK: 495 case SMTP_AUTH_ACK:
499 if (smtp->capa & CAPA_AUTH) 496 if (smtp->capa & CAPA_AUTH)
......