tidying

diff --git a/src/OS/os.h-Darwin b/src/OS/os.h-Darwin
index 4667689c9b171cddc52aee5050774fd864b6636d..7e3a67c4e46aacd44f4e5c09a04501ced876b246 100644 (file)
--- 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
 
 #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
 
 rather than a modified sendto() */
 #define EXIM_TFO_CONNECTX
 

diff --git a/src/src/ip.c b/src/src/ip.c
index 2a6a2492296f08401c47ba411fd9e7b3a4cc1a8b..552f7dc3779dc967a3223ca003ec841ce1919cb3 100644 (file)
--- 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)
       {
       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 */
       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 a5646811ff8738ce77b2a3e296851d9fd910abeb..c86ad2f48b547283aea10765a742fd5b1348880a 100644 (file)
--- 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)
   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);
 
       "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)
   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);
 
       "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;
     }
   }
     return FALSE;
     }
   }

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index f0351451c6ed5d8b48039eda84a351b51dcd1730..3299c2046711f6cd1301465aad0f18ac7107dae7 100644 (file)
--- 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
 #  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
 # endif
 # if OPENSSL_VERSION_NUMBER >= 0x010000000L \
     && (OPENSSL_VERSION_NUMBER & 0x0000ff000L) >= 0x000002000L


@@ -1714,8 +1716,10 @@ cbinfo->host = host;
 cbinfo->event_action = NULL;
 #endif
 
 cbinfo->event_action = NULL;
 #endif
 

+#ifdef EXIM_NEED_OPENSSL_INIT

 SSL_load_error_strings();          /* basic set up */
 OpenSSL_add_ssl_algorithms();
 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
 
 #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 */
 
 /* 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();
 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. */
 #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. */