[SCM] GNU Mailutils branch, master, updated. rel-2_1-15-gb66ffed

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=b66ffedcecf7506efc8631dfe1047c0a1d28af80

The branch, master has been updated
       via  b66ffedcecf7506efc8631dfe1047c0a1d28af80 (commit)
      from  34bbf3cc3526975957cc22345f63849c66742a75 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b66ffedcecf7506efc8631dfe1047c0a1d28af80
Author: Sergey Poznyakoff <[email protected]>
Date:   Wed Dec 2 21:43:14 2009 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 libproto/mailer/smtp.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libproto/mailer/smtp.c b/libproto/mailer/smtp.c
index f78890a..1573a65 100644
--- a/libproto/mailer/smtp.c
+++ b/libproto/mailer/smtp.c
@@ -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)


hooks/post-receive
-- 
GNU Mailutils