DANE: Fix 2-rcpt message, diff domins case. Bug 2265

[exim.git] / src / OS / os.h-FreeBSD

diff --git a/src/OS/os.h-FreeBSD b/src/OS/os.h-FreeBSD
index 3a06e766ed365a75e01f8ac99305e309a57ad8d3..73d99767a0053081681d3354596519a7364c9583 100644 (file)
--- a/src/OS/os.h-FreeBSD
+++ b/src/OS/os.h-FreeBSD
@@ -1,6 +1,11 @@
 /* Exim: OS-specific C header file for FreeBSD */
 /* Exim: OS-specific C header file for FreeBSD */

+/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
+/* See the file NOTICE for conditions of use and distribution. */
+

 
 #include <sys/types.h>
 
 #include <sys/types.h>

+#include <sys/param.h>

 
 #define HAVE_BSD_GETLOADAVG
 #define HAVE_SETCLASSRESOURCES
 
 #define HAVE_BSD_GETLOADAVG
 #define HAVE_SETCLASSRESOURCES


@@ -10,6 +15,14 @@
 #define HAVE_SRANDOMDEV
 #define HAVE_ARC4RANDOM
 
 #define HAVE_SRANDOMDEV
 #define HAVE_ARC4RANDOM
 

+/* Applications should not call arc4random_stir() explicitly after
+ * FreeBSD r227520 (approximately 1000002).
+ * Set NOT_HAVE_ARC4RANDOM_STIR if the version released is past
+ * that point. */
+#if __FreeBSD_version >= 1000002
+# define NOT_HAVE_ARC4RANDOM_STIR
+#endif
+

 typedef struct flock flock_t;
 
 /* iconv arg2 type: libiconv in Ports uses "const char* * inbuf" and was
 typedef struct flock flock_t;
 
 /* iconv arg2 type: libiconv in Ports uses "const char* * inbuf" and was


@@ -33,9 +46,8 @@ typedef struct flock flock_t;
 #if __FreeBSD__ >= 10
 # define LIBICONV_PLUG
 #endif
 #if __FreeBSD__ >= 10
 # define LIBICONV_PLUG
 #endif

-/* for more specific version constraints, include <sys/param.h> and look at
- * __FreeBSD_version */
-
+/* for more specific version constraints, look at __FreeBSD_version
+ * from <sys/param.h> */

 
 /* When using DKIM, setting OS_SENDFILE can increase
 performance on outgoing mail a bit. */
 
 /* When using DKIM, setting OS_SENDFILE can increase
 performance on outgoing mail a bit. */


@@ -46,15 +58,10 @@ extern ssize_t os_sendfile(int, int, off_t *, size_t);
 
 /*******************/
 
 
 /*******************/
 

-/* TCP_FASTOPEN support.  There does not seems to be a
-MSG_FASTOPEN defined yet... */
+#define EXIM_TFO_PROBE
+#define EXIM_TFO_FREEBSD
+

 
 

-#include <netinet/tcp.h>        /* for TCP_FASTOPEN */
-#include <sys/socket.h>         /* for MSG_FASTOPEN */
-#if defined(TCP_FASTOPEN) && !defined(MSG_FASTOPEN)
-# define MSG_FASTOPEN 0x20000000
-#endif
- 

 /* for TCP state-variable values, for TFO logging */
 #include <netinet/tcp_fsm.h>
 #define TCP_SYN_RECV TCPS_SYN_RECEIVED
 /* for TCP state-variable values, for TFO logging */
 #include <netinet/tcp_fsm.h>
 #define TCP_SYN_RECV TCPS_SYN_RECEIVED