diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/deliver.c | 6 | ||||
| -rw-r--r-- | src/src/dkim.c | 2 | ||||
| -rw-r--r-- | src/src/dkim_transport.c | 9 | ||||
| -rw-r--r-- | src/src/sieve.c | 5 | ||||
| -rw-r--r-- | src/src/tls-openssl.c | 2 |
5 files changed, 15 insertions, 9 deletions
diff --git a/src/src/deliver.c b/src/src/deliver.c index 34f36cd33..c35f3fa5b 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -1553,7 +1553,7 @@ if (addr->return_file >= 0 && addr->return_filename) log_write(0, LOG_MAIN, "<%s>: %s transport output: %s", addr->address, tb->name, sp); } - (void)fclose(f); + (void)fclose(f); } /* Handle returning options, but only if there is an address to return @@ -7720,9 +7720,10 @@ wording. */ addr->address); if ((hu = addr->host_used) && hu->name) { - const uschar * s; fprintf(f, "Remote-MTA: dns; %s\n", hu->name); #ifdef EXPERIMENTAL_DSN_INFO + { + const uschar * s; if (hu->address) { uschar * p = hu->port == 25 @@ -7735,6 +7736,7 @@ wording. */ fprintf(f, "X-Remote-MTA-helo-response: X-str; %s\n", s); if ((s = addr->message) && *s) fprintf(f, "X-Exim-Diagnostic: X-str; %s\n", s); + } #endif print_dsn_diagnostic_code(addr, f); } diff --git a/src/src/dkim.c b/src/src/dkim.c index d223f9e62..f400f7441 100644 --- a/src/src/dkim.c +++ b/src/src/dkim.c @@ -813,7 +813,7 @@ for (sig = dkim_signatures; sig; sig = sig->next) g = string_cat(g, US"permerror (overlong public key record)\n\t\t"); break; case PDKIM_VERIFY_INVALID_PUBKEY_DNSRECORD: case PDKIM_VERIFY_INVALID_PUBKEY_IMPORT: - g = string_cat(g, US"neutral (syntax error in public key record)\n\t\t"); + g = string_cat(g, US"neutral (public key record import problem)\n\t\t"); break; case PDKIM_VERIFY_INVALID_SIGNATURE_ERROR: g = string_cat(g, US"neutral (signature tag missing or invalid)\n\t\t"); diff --git a/src/src/dkim_transport.c b/src/src/dkim_transport.c index 114586803..c35ba1eff 100644 --- a/src/src/dkim_transport.c +++ b/src/src/dkim_transport.c @@ -129,7 +129,6 @@ uschar * hdrs; gstring * dkim_signature; int hsize; const uschar * errstr; -uschar * verrstr; BOOL rc; DEBUG(D_transport) debug_printf("dkim signing direct-mode\n"); @@ -166,12 +165,14 @@ if (!(dkim_signature = dkim_exim_sign(deliver_datafile, SPOOL_DATA_START_OFFSET, #ifdef EXPERIMENTAL_ARC if (dkim->arc_signspec) /* Prepend ARC headers */ - if (!(dkim_signature = - arc_sign(dkim->arc_signspec, dkim_signature, &verrstr))) + { + uschar * e; + if (!(dkim_signature = arc_sign(dkim->arc_signspec, dkim_signature, &e))) { - *err = verrstr; + *err = e; return FALSE; } + } #endif /* Write the signature and headers into the deliver-out-buffer. This should diff --git a/src/src/sieve.c b/src/src/sieve.c index c7adfe169..cf9081973 100644 --- a/src/src/sieve.c +++ b/src/src/sieve.c @@ -21,7 +21,7 @@ #include "exim.h" #if HAVE_ICONV -#include <iconv.h> +# include <iconv.h> #endif /* Define this for RFC compliant \r\n end-of-line terminators. */ @@ -153,8 +153,10 @@ static uschar str_cc_c[]="Cc"; static const struct String str_cc={ str_cc_c, 2 }; static uschar str_bcc_c[]="Bcc"; static const struct String str_bcc={ str_bcc_c, 3 }; +#ifdef ENVELOPE_AUTH static uschar str_auth_c[]="auth"; static const struct String str_auth={ str_auth_c, 4 }; +#endif static uschar str_sender_c[]="Sender"; static const struct String str_sender={ str_sender_c, 6 }; static uschar str_resent_from_c[]="Resent-From"; @@ -3379,7 +3381,6 @@ while (*filter->pc) { uschar *mime_body,*reason_end; static const uschar nlnl[]="\r\n\r\n"; - gstring * g; for ( diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index cefa94fec..e69b64ce0 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -1752,6 +1752,7 @@ else * Set up for verifying certificates * *************************************************/ +#ifndef DISABLE_OCSP /* Load certs from file, return TRUE on success */ static BOOL @@ -1769,6 +1770,7 @@ while ((x = PEM_read_bio_X509(bp, NULL, 0, NULL))) BIO_free(bp); return TRUE; } +#endif |