X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/5ea5d64c99a3f99722034f11d7bf79ab9d10f014..a5ffa9b475a426bc73366db01f7cc92a3811bc3a:/src/src/verify.c diff --git a/src/src/verify.c b/src/src/verify.c index 706d42a0f..3a8f9b6bc 100644 --- a/src/src/verify.c +++ b/src/src/verify.c @@ -1177,7 +1177,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 ) @@ -1344,6 +1344,7 @@ tctx.tblock = cutthrough.addr.transport; tctx.addr = &cutthrough.addr; tctx.check_string = US"."; tctx.escape_string = US".."; +/*XXX check under spool_files_wireformat. Might be irrelevant */ tctx.options = topt_use_crlf; if (!transport_headers_send(&tctx, &cutthrough_write_chunk)) @@ -1516,7 +1517,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);