Bugfix.

* libproto/mailer/smtp.c (smtp_open): Don't issue second EHLO if STARTTLS failed.

Bugfix.
* libproto/mailer/smtp.c (smtp_open): Don't issue second EHLO if STARTTLS failed.
Sergey Poznyakoff
Commit b66ffedc ... b66ffedcecf7506efc8631dfe1047c0a1d28af80 authored 2009-12-02 21:43:14 +0200 by Sergey Poznyakoff
Showing 1 changed file with 3 additions and 6 deletions
libproto/mailer/smtp.c
--- a/libproto/mailer/smtp.c
View file @b66ffed
+++ b/libproto/mailer/smtp.c
View file @b66ffed
@@ -488,12 +488,9 @@ smtp_open (mu_mailer_t mailer, int flags)

    case SMTP_STARTTLS:
    case SMTP_STARTTLS_ACK:
-      if (smtp->capa & CAPA_STARTTLS)
-	{
-	  smtp_starttls (smtp);
-	  goto ehlo;
-	}
-
+      if ((smtp->capa & CAPA_STARTTLS) && smtp_starttls (smtp) == 0)
+	goto ehlo;
+      
    case SMTP_AUTH:
    case SMTP_AUTH_ACK:
      if (smtp->capa & CAPA_AUTH)