X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Farc.c;h=80bb30e0373bea2e838d45e05521779eddfa84c8;hb=75c121f07a85b4029458f11b113a4655114af126;hp=58811274ef8b9efac8b1dbc720d2a12c99d8e536;hpb=97e939dfe2ea44a6e243ff6f489790ccd94f39ee;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/arc.c b/src/src/arc.c index 58811274e..80bb30e03 100644 --- a/src/src/arc.c +++ b/src/src/arc.c @@ -984,16 +984,13 @@ return NULL; static const uschar * arc_verify_seals(arc_ctx * ctx) { -arc_set * as = ctx->arcset_chain; +arc_set * as = ctx->arcset_chain_last; if (!as) return US"none"; -while (as) - { - if (arc_seal_verify(ctx, as)) return US"fail"; - as = as->next; - } +for ( ; as; as = as->prev) if (arc_seal_verify(ctx, as)) return US"fail"; + DEBUG(D_acl) debug_printf("ARC: AS vfy overall pass\n"); return NULL; } @@ -1258,6 +1255,9 @@ if ( (errstr = exim_dkim_signing_init(privkey, &sctx)) || (errstr = exim_dkim_sign(&sctx, hm, &hhash, sig))) { log_write(0, LOG_MAIN, "ARC: %s signing: %s\n", why, errstr); + DEBUG(D_transport) + debug_printf("private key, or private-key file content, was: '%s'\n", + privkey); return FALSE; } return TRUE; @@ -1702,7 +1702,7 @@ if (g) /* Finally, append the dkim headers and return the lot. */ -g = string_catn(g, sigheaders->s, sigheaders->ptr); +if (sigheaders) g = string_catn(g, sigheaders->s, sigheaders->ptr); (void) string_from_gstring(g); gstring_reset_unused(g); return g; @@ -1840,7 +1840,7 @@ if (arc_state) US" arc.oldest-pass=", string_sprintf("%d", arc_oldest_pass)); if (sender_host_address) - g = string_append(g, 2, US" smtp.client-ip=", sender_host_address); + g = string_append(g, 2, US" smtp.remote-ip=", sender_host_address); } else if (arc_state_reason) g = string_append(g, 3, US" (", arc_state_reason, US")");