From 3837a2bc1158b4044ae5dddb3df0a9285949f228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= Date: Fri, 7 Nov 2003 11:54:24 +0000 Subject: Don't call smtp_starttls_set_password_cb() unless StartTLS is enabled (Maurice Galland). --- NEWS | 3 +++ smtp.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 2a9487d..332b0f6 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,9 @@ News * Version 0.4.2 (under development): + * Fixed another bug which prevented to send mail when libesmtp had no + openssl support (Maurice Galland). + * Detailed documentation on how to use the StartTLS extension. More verbosity on StartTLS error messages. diff --git a/smtp.c b/smtp.c index f111ea4..9fe8aa1 100644 --- a/smtp.c +++ b/smtp.c @@ -433,7 +433,7 @@ void smtp_send(message_t *msg) /* Use our callback for X.509 certificate passwords. If STARTTLS is not in * use or disabled in configure, the following is harmless. */ - if(!smtp_starttls_set_password_cb (tlsinteract, identity)) + if(identity->starttls && !smtp_starttls_set_password_cb (tlsinteract, identity)) goto failure; /* Now tell libESMTP it can use the SMTP AUTH extension. */ -- cgit v1.2.3