Move errno-protection into string_open_failed()

[users/heiko/exim.git] / src / src / tls-gnu.c

diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index eff9e8859bdd3a28e9252e4e7b15bc633e090aaf..6308f10df4d00bb29ef55b0f88c8365a200dbe3d 100644 (file)
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -427,10 +427,12 @@ uschar * errstr;
 msg = rc == GNUTLS_E_FATAL_ALERT_RECEIVED
   ? string_sprintf("A TLS fatal alert has been received: %s",
       US gnutls_alert_get_name(gnutls_alert_get(state->session)))
+#ifdef GNUTLS_E_PREMATURE_TERMINATION
   : rc == GNUTLS_E_PREMATURE_TERMINATION && errno
   ? errno == ECONNRESET                /* Outlook does this to us right after sending us QUIT */
   ? string_sprintf("syscall: %s", strerror(errno))
   : string_sprintf("%s: syscall: %s", US gnutls_strerror(rc), strerror(errno))
+#endif
   : US gnutls_strerror(rc);
 
 (void) tls_error(when, msg, state->host, &errstr);
@@ -726,7 +728,7 @@ else if (errno == ENOENT)
     debug_printf("D-H parameter cache file \"%s\" does not exist\n", filename);
   }
 else
-  return tls_error(string_open_failed(errno, "\"%s\" for reading", filename),
+  return tls_error(string_open_failed("\"%s\" for reading", filename),
       NULL, NULL, errstr);
 
 /* If ret < 0, either the cache file does not exist, or the data it contains