From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 7 Jun 2020 15:38:28 +0000 (+0100)
Subject: OpenSSL: more info on accept zero-error
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/4f10c76912b0ac78397ea157306460c20f30689a?ds=sidebyside

OpenSSL: more info on accept zero-error
---

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index a1d299b69..3d0e84f6d 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -2738,6 +2738,7 @@ SSL_set_accept_state(server_ssl);
 
 DEBUG(D_tls) debug_printf("Calling SSL_accept\n");
 
+ERR_clear_error();
 sigalrm_seen = FALSE;
 if (smtp_receive_timeout > 0) ALARM(smtp_receive_timeout);
 rc = SSL_accept(server_ssl);
@@ -2787,7 +2788,10 @@ if (rc <= 0)
 	  }
 	DEBUG(D_tls) debug_printf(" - syscall %s\n", strerror(errno));
 	}
-      (void) tls_error(US"SSL_accept", NULL, sigalrm_seen ? US"timed out" : NULL, errstr);
+      (void) tls_error(US"SSL_accept", NULL,
+		      sigalrm_seen ? US"timed out"
+		      : ERR_peek_error() ? NULL : string_sprintf("ret %d", error),
+		      errstr);
       return FAIL;
     }
   }