X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0851a3bbf4667081d47f5d85b6b3a5cb33cbdba6..b6054898ace169a0e5143117397a4f666a5e7283:/src/src/tls-openssl.c

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 525afd650..5bc9f8f53 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -496,7 +496,6 @@ RSA *rsa_key;
 BIGNUM *bn = BN_new();
 #endif
 
-export = export;     /* Shut picky compilers up */
 DEBUG(D_tls) debug_printf("Generating %d bit RSA key...\n", keylength);
 
 #ifdef EXIM_HAVE_RSA_GENKEY_EX
@@ -3201,6 +3200,7 @@ tlsp->tlsa_usage = 0;
 #ifndef DISABLE_OCSP
   {
 # ifdef SUPPORT_DANE
+  /*XXX this should be moved to caller, to be common across gnutls/openssl */
   if (  conn_args->dane
      && ob->hosts_request_ocsp[0] == '*'
      && ob->hosts_request_ocsp[1] == '\0'
@@ -3674,7 +3674,7 @@ context for the stashed information. */
 a store reset there, so use POOL_PERM. */
 /* + if CHUNKING, cmds EHLO,MAIL,RCPT(s),BDAT */
 
-if ((more || corked))
+if (more || corked)
   {
   if (!len) buff = US &error;	/* dummy just so that string_catn is ok */
 
@@ -3723,9 +3723,16 @@ for (int left = len; left > 0;)
       return -1;
 
     case SSL_ERROR_SYSCALL:
-      log_write(0, LOG_MAIN, "SSL_write: (from %s) syscall: %s",
-	sender_fullhost ? sender_fullhost : US"<unknown>",
-	strerror(errno));
+      if (ct_ctx || errno != ECONNRESET || !f.smtp_in_quit)
+	log_write(0, LOG_MAIN, "SSL_write: (from %s) syscall: %s",
+	  sender_fullhost ? sender_fullhost : US"<unknown>",
+	  strerror(errno));
+      else if (LOGGING(protocol_detail))
+	log_write(0, LOG_MAIN, "[%s] after QUIT, client reset TCP before"
+	  " SMTP response and TLS close\n", sender_host_address);
+      else
+	DEBUG(D_tls) debug_printf("[%s] SSL_write: after QUIT,"
+	  " client reset TCP before TLS close\n", sender_host_address);
       return -1;
 
     default: