X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fdkim_transport.c;h=6b643927c9c1500c2feb89590240f3a515e6b451;hb=96c5bd4049c62215b741ff7b6ff7a3bf24bea7c0;hp=db3db91809b6d7a55e0f0cedae82a4456bfe8024;hpb=74f1a42304ce056cf979d22fb970faae161e3ab2;p=exim.git diff --git a/src/src/dkim_transport.c b/src/src/dkim_transport.c index db3db9180..6b643927c 100644 --- a/src/src/dkim_transport.c +++ b/src/src/dkim_transport.c @@ -83,7 +83,7 @@ else while (sread) { -#ifdef SUPPORT_TLS +#ifndef DISABLE_TLS wwritten = tls_out.active.sock == out_fd ? tls_write(tls_out.active.tls_ctx, p, sread, FALSE) : write(out_fd, CS p, sread); @@ -124,7 +124,7 @@ dkt_direct(transport_ctx * tctx, struct ob_dkim * dkim, { int save_fd = tctx->u.fd; int save_options = tctx->options; -BOOL save_wireformat = spool_file_wireformat; +BOOL save_wireformat = f.spool_file_wireformat; uschar * hdrs; gstring * dkim_signature; int hsize; @@ -157,7 +157,7 @@ arc_sign_init(); /* The dotstuffed status of the datafile depends on whether it was stored in wireformat. */ -dkim->dot_stuffed = spool_file_wireformat; +dkim->dot_stuffed = f.spool_file_wireformat; if (!(dkim_signature = dkim_exim_sign(deliver_datafile, SPOOL_DATA_START_OFFSET, hdrs, dkim, &errstr))) if (!(rc = dkt_sign_fail(dkim, &errno))) @@ -186,7 +186,7 @@ having already been done - but we have to say we want CRLF output format, and temporarily set the marker for possible already-CRLF input. */ tctx->options &= ~topt_escape_headers; -spool_file_wireformat = TRUE; +f.spool_file_wireformat = TRUE; transport_write_reset(0); if ( ( dkim_signature && dkim_signature->ptr > 0 @@ -196,7 +196,7 @@ if ( ( dkim_signature ) return FALSE; -spool_file_wireformat = save_wireformat; +f.spool_file_wireformat = save_wireformat; tctx->options = save_options | topt_no_headers | topt_continuation; if (!(transport_write_message(tctx, 0)))