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

1 files changed, 1 insertions, 1 deletions

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