Don't call smtp_starttls_set_password_cb() unless StartTLS is enabled (Maurice Galland).

2 files changed, 4 insertions, 1 deletions

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. */