Do not rely on linker identifying common strings

[user/henk/code/exim.git] / src / src / verify.c

diff --git a/src/src/verify.c b/src/src/verify.c
index 6a50af5069abbf6cbc584189904f685577a7b81f..cda0b72e2d1786f6c881a7279fe57c4c978abd38 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -795,7 +795,9 @@ tls_retry_connection:
          {
          case PENDING_OK:
            new_domain_record.random_result = ccache_accept;
-           break;
+           yield = OK;         /* Only usable result we can return */
+           done = TRUE;
+           goto no_conn;
          case FAIL:
            new_domain_record.random_result = ccache_reject;
 
@@ -1177,7 +1179,7 @@ if(cutthrough.fd < 0)
 
 if(
 #ifdef SUPPORT_TLS
-   (tls_out.active == cutthrough.fd) ? tls_write(FALSE, ctblock.buffer, n) :
+   tls_out.active == cutthrough.fd ? tls_write(FALSE, ctblock.buffer, n, FALSE) :
 #endif
    send(cutthrough.fd, ctblock.buffer, n, 0) > 0
   )
@@ -1517,7 +1519,7 @@ va_list ap;
 
 va_start(ap, format);
 if (smtp_out && (f == smtp_out))
-  smtp_vprintf(format, ap);
+  smtp_vprintf(format, FALSE, ap);
 else
   vfprintf(f, format, ap);
 va_end(ap);