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=bec7b95e67fa1adcff64372ec05253ca7ed9b54e The branch, master has been updated via bec7b95e67fa1adcff64372ec05253ca7ed9b54e (commit) via b27174f61c61a71f183403d2f5f5730065d01db5 (commit) from ac04b91746a9192b6492fa43fe56200a8c21c65c (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 bec7b95e67fa1adcff64372ec05253ca7ed9b54e Author: Sergey Poznyakoff <g...@gnu.org.ua> Date: Wed May 9 16:00:05 2012 +0300 Ninor change in bootstrap. * bootstrap.conf: Avoid downloading radius.m4 if it is already here. commit b27174f61c61a71f183403d2f5f5730065d01db5 Author: Sergey Poznyakoff <g...@gnu.org.ua> Date: Wed May 9 15:47:17 2012 +0300 Fix SMTP STARTTLS and SMTPS * libproto/mailer/smtp.c (smtp_open): Do not use mu_tls_enable, rely on TLS stream functions to do the right thing. This complements 325c864eb1b88ac73c39ca3681a02f5194021806. ----------------------------------------------------------------------- Summary of changes: bootstrap.conf | 3 ++- libproto/mailer/smtp.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index e4954b5..baf04e7 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -96,7 +96,8 @@ do done # Grab the latest radius.m4 -wget -P m4 http://git.savannah.gnu.org/cgit/radius.git/plain/scripts/radius.m4 +test -f m4/radius.m4 || + wget -P m4 http://git.savannah.gnu.org/cgit/radius.git/plain/scripts/radius.m4 # Create included listings for texinfo docs. #make -C doc/texinfo -f maint.mk diff --git a/libproto/mailer/smtp.c b/libproto/mailer/smtp.c index a7fea63..f8f3dd4 100644 --- a/libproto/mailer/smtp.c +++ b/libproto/mailer/smtp.c @@ -206,7 +206,7 @@ smtp_open (mu_mailer_t mailer, int flags) return rc; } #ifdef WITH_TLS - if (tls && mu_tls_enable) + if (tls) { mu_stream_t tlsstream; @@ -219,9 +219,11 @@ smtp_open (mu_mailer_t mailer, int flags) (_("cannot create TLS stream: %s"), mu_strerror (rc))); mu_sockaddr_free (sa); - return rc; + if (mu_tls_enable) + return rc; } - transport = tlsstream; + else + transport = tlsstream; nostarttls = 1; } #endif @@ -240,7 +242,7 @@ smtp_open (mu_mailer_t mailer, int flags) return rc; #ifdef WITH_TLS - if (!nostarttls && mu_tls_enable && + if (!nostarttls && mu_smtp_capa_test (smtp_mailer->smtp, "STARTTLS", NULL) == 0) { rc = mu_smtp_starttls (smtp_mailer->smtp); hooks/post-receive -- GNU Mailutils _______________________________________________ Commit-mailutils mailing list Commit-mailutils@gnu.org https://lists.gnu.org/mailman/listinfo/commit-mailutils
