git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OpenSSL: add remote host info to log line for in-connection TLS error. Bug 3010
[exim.git]
/
src
/
src
/
tls-openssl.c
diff --git
a/src/src/tls-openssl.c
b/src/src/tls-openssl.c
index 22c8ea99ae83bebeddd91ad857ad35e75725474b..2e537a160c05f3e18414bb87bdc4a283ec696ff4 100644
(file)
--- a/
src/src/tls-openssl.c
+++ b/
src/src/tls-openssl.c
@@
-4532,10
+4532,15
@@
switch(error)
/* Handle genuine errors */
case SSL_ERROR_SSL:
/* Handle genuine errors */
case SSL_ERROR_SSL:
+ {
+ uschar * conn_info = smtp_get_connection_info();
+ if (Ustrncmp(conn_info, US"SMTP ", 5) == 0) conn_info += 5;
+ /* I'd like to get separated H= here, but too hard for now */
ERR_error_string_n(ERR_get_error(), ssl_errstring, sizeof(ssl_errstring));
ERR_error_string_n(ERR_get_error(), ssl_errstring, sizeof(ssl_errstring));
- log_write(0, LOG_MAIN, "TLS error (SSL_read):
%s"
, ssl_errstring);
+ log_write(0, LOG_MAIN, "TLS error (SSL_read):
on %s %s", conn_info
, ssl_errstring);
ssl_xfer_error = TRUE;
return FALSE;
ssl_xfer_error = TRUE;
return FALSE;
+ }
default:
DEBUG(D_tls) debug_printf("Got SSL error %d\n", error);
default:
DEBUG(D_tls) debug_printf("Got SSL error %d\n", error);