diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-03-28 14:15:23 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-03-28 14:15:23 +0100 |
| commit | c3d43245c842965fed6a9153f9c6e9e8be326b7c (patch) | |
| tree | 8828e35ed112ba12ee983796372ff7a6082b762c | |
| parent | b3d9ebf57a10a5f35783d2f9802f2201624c1a20 (diff) | |
ARC: log signing-spec errors in mainlog only, not paniclog
| -rw-r--r-- | src/src/arc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/src/arc.c b/src/src/arc.c index 5f51d614d..dedf64c44 100644 --- a/src/src/arc.c +++ b/src/src/arc.c @@ -1239,7 +1239,7 @@ else if ( (errstr = exim_dkim_signing_init(privkey, &sctx)) || (errstr = exim_dkim_sign(&sctx, hm, &hhash, sig))) { - log_write(0, LOG_MAIN|LOG_PANIC, "ARC: %s signing: %s\n", why, errstr); + log_write(0, LOG_MAIN, "ARC: %s signing: %s\n", why, errstr); return FALSE; } return TRUE; @@ -1550,12 +1550,12 @@ selector = string_nextinlist(&signspec, &sep, NULL, 0); if ( !*identity | !*selector || !(privkey = string_nextinlist(&signspec, &sep, NULL, 0)) || !*privkey) { - log_write(0, LOG_MAIN|LOG_PANIC, "ARC: bad signing-specification (%s)", + log_write(0, LOG_MAIN, "ARC: bad signing-specification (%s)", !*identity ? "identity" : !*selector ? "selector" : "private-key"); - return NULL; + return sigheaders ? sigheaders : string_get(0); } if (*privkey == '/' && !(privkey = expand_file_big_buffer(privkey))) - return NULL; + return sigheaders ? sigheaders : string_get(0); DEBUG(D_transport) debug_printf("ARC: sign for %s\n", identity); @@ -1584,7 +1584,7 @@ else if (!(arc_sign_find_ar(headers, identity, &ar))) { - log_write(0, LOG_MAIN|LOG_PANIC, "ARC: no Authentication-Results header for signing"); + log_write(0, LOG_MAIN, "ARC: no Authentication-Results header for signing"); return sigheaders ? sigheaders : string_get(0); } |