[exim-cvs] tidying

Gitweb: https://git.exim.org/exim.git/commitdiff/7434882dd8dae78f598f41c9f9bcd42b2ee7f4a7

Commit:     7434882dd8dae78f598f41c9f9bcd42b2ee7f4a7
Parent:     dbcb6d0acbbd69b8a68ba117530e00300ec698ba
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Oct 27 17:03:09 2018 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Tue Nov 6 19:17:50 2018 +0000

    tidying
---
 src/OS/os.h-Darwin    |  2 +-
 src/src/ip.c          |  2 +-
 src/src/receive.c     | 12 ++++++------
 src/src/tls-openssl.c |  6 ++++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/OS/os.h-Darwin b/src/OS/os.h-Darwin
index 4667689..7e3a67c 100644
--- a/src/OS/os.h-Darwin
+++ b/src/OS/os.h-Darwin
@@ -51,7 +51,7 @@ in "man 2 getgroups". */
#define _DARWIN_UNLIMITED_GETGROUPS
#define EXIM_GROUPLIST_SIZE 64

-/* TCP Fast Open: Darwin uses a connectex() call
+/* TCP Fast Open: Darwin uses a connectx() call
rather than a modified sendto() */
#define EXIM_TFO_CONNECTX

diff --git a/src/src/ip.c b/src/src/ip.c
index 2a6a249..552f7dc 100644
--- a/src/src/ip.c
+++ b/src/src/ip.c
@@ -320,7 +320,7 @@ if (fastopen_blob && f.tcp_fastopen_ok)
       fastopen_blob->len > 0 ? "with"  : "no");
     if (!fastopen_blob->data)
       {
-      tcp_out_fastopen = TFO_ATTEMPTED;        /* we tried; unknown if useful yet */
+      tcp_out_fastopen = TFO_ATTEMPTED_NODATA;        /* we tried; unknown if useful yet */
       rc = 0;
       }
     else    /* assume that no data was queued; block in send */
diff --git a/src/src/receive.c b/src/src/receive.c
index a564681..c86ad2f 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -266,7 +266,7 @@ if (check_spool_space > 0 || msg_size > 0 || check_spool_inodes > 0)
   space = receive_statvfs(TRUE, &inodes);

   DEBUG(D_receive)
-    debug_printf("spool directory space = %dK inodes = %d "
+    debug_printf("spool directory space = " PR_EXIM_ARITH "K inodes = %d "
       "check_space = " PR_EXIM_ARITH "K inodes = %d msg_size = %d\n",
       space, inodes, check_spool_space, check_spool_inodes, msg_size);

@@ -284,15 +284,15 @@ if (check_log_space > 0 || check_log_inodes > 0)
space = receive_statvfs(FALSE, &inodes);

   DEBUG(D_receive)
-    debug_printf("log directory space = %dK inodes = %d "
+    debug_printf("log directory space = " PR_EXIM_ARITH "K inodes = %d "
       "check_space = " PR_EXIM_ARITH "K inodes = %d\n",
       space, inodes, check_log_space, check_log_inodes);

-  if ((space >= 0 && space < check_log_space) ||
-      (inodes >= 0 && inodes < check_log_inodes))
+  if (  space >= 0 && space < check_log_space
+     || inodes >= 0 && inodes < check_log_inodes)
     {
-    log_write(0, LOG_MAIN, "log directory space check failed: space=%d "
-      "inodes=%d", space, inodes);
+    log_write(0, LOG_MAIN, "log directory space check failed: space=" PR_EXIM_ARITH
+      " inodes=%d", space, inodes);
     return FALSE;
     }
   }
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index f035145..3299c20 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -71,6 +71,8 @@ functions from the OpenSSL library. */
 #  define EXIM_HAVE_OPENSSL_CHECKHOST
 #  define EXIM_HAVE_OPENSSL_DH_BITS
 #  define EXIM_HAVE_OPENSSL_TLS_METHOD
+# else
+#  define EXIM_NEED_OPENSSL_INIT
 # endif
 # if OPENSSL_VERSION_NUMBER >= 0x010000000L \
     && (OPENSSL_VERSION_NUMBER & 0x0000ff000L) >= 0x000002000L
@@ -1714,8 +1716,10 @@ cbinfo->host = host;
 cbinfo->event_action = NULL;
 #endif

+#ifdef EXIM_NEED_OPENSSL_INIT
 SSL_load_error_strings();          /* basic set up */
 OpenSSL_add_ssl_algorithms();
+#endif

#ifdef EXIM_HAVE_SHA256
/* SHA256 is becoming ever more popular. This makes sure it gets added to the
@@ -3056,8 +3060,10 @@ uschar *s, *expciphers, *err;
/* this duplicates from tls_init(), we need a better "init just global
state, for no specific purpose" singleton function of our own */

+#ifdef EXIM_NEED_OPENSSL_INIT
SSL_load_error_strings();
OpenSSL_add_ssl_algorithms();
+#endif
#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256)
/* SHA256 is becoming ever more popular. This makes sure it gets added to the
list of available digests. */