diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-01-15 16:50:20 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-02-10 16:54:50 +0000 |
| commit | cf0c61644d7dd2dfb29f6418d95bf4d8cae199ea (patch) | |
| tree | a61cf4241c3cb5af8b254316dc22065e8e155f64 /test/runtest | |
| parent | e51462229029e40afa0932dd9c6337192a0dc70b (diff) | |
TLS: rework error logging to pass more string back to caller for logging
This permits a library-sourced error to be associated with an address
being delivered, collapsing pairs of log lines
Diffstat (limited to 'test/runtest')
| -rwxr-xr-x | test/runtest | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/runtest b/test/runtest index 59f61c6a6..15631dfeb 100755 --- a/test/runtest +++ b/test/runtest @@ -800,7 +800,10 @@ RESET_AFTER_EXTRA_LINE_READ: # numbers, or handle specific bad conditions in different ways, leading to # different wording in the error messages, so we cannot compare them. - s/(TLS error on connection (?:from .* )?\(SSL_\w+\): error:)(.*)/$1 <<detail omitted>>/; +#XXX This loses any trailing "deliving unencypted to" which is unfortunate +# but I can't work out how to deal with that. + s/(TLS session: \(SSL_\w+\): error:)(.*)(?!: delivering)/$1 <<detail omitted>>/; + s/(TLS error on connection from .* \(SSL_\w+\): error:)(.*)/$1 <<detail omitted>>/; next if /SSL verify error: depth=0 error=certificate not trusted/; # ======== Maildir things ======== |