Fix no-SSL build
authorJeremy Harris <jgh146exb@wizmail.org>
Fri, 3 Feb 2017 14:00:40 +0000 (14:00 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Fri, 3 Feb 2017 14:00:40 +0000 (14:00 +0000)
src/src/verify.c

index 96c2b66cc0b16a0a95117043a785c24eeedd1f0a..7b136d4ccf33908a05c36cdc1c22b82c3442fd97 100644 (file)
@@ -682,7 +682,9 @@ tls_retry_connection:
     SMTP command to send.  If we tried TLS but it failed, try again without
     if permitted */
 
     SMTP command to send.  If we tried TLS but it failed, try again without
     if permitted */
 
-    if (  (yield = smtp_setup_conn(&sx, FALSE)) == DEFER
+    yield = smtp_setup_conn(&sx, FALSE);
+#ifdef SUPPORT_TLS
+    if (  yield == DEFER
        && addr->basic_errno == ERRNO_TLSFAILURE
        && ob->tls_tempfail_tryclear
        && verify_check_given_host(&ob->hosts_require_tls, host) != OK
        && addr->basic_errno == ERRNO_TLSFAILURE
        && ob->tls_tempfail_tryclear
        && verify_check_given_host(&ob->hosts_require_tls, host) != OK
@@ -694,6 +696,7 @@ tls_retry_connection:
       addr->transport_return = PENDING_DEFER;
       yield = smtp_setup_conn(&sx, TRUE);
       }
       addr->transport_return = PENDING_DEFER;
       yield = smtp_setup_conn(&sx, TRUE);
       }
+#endif
     if (yield != OK)
       {
       errno = addr->basic_errno;
     if (yield != OK)
       {
       errno = addr->basic_errno;