CVE-2020-28018: Use-after-free in tls-openssl.c

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

diff --git a/src/OS/os.h-Darwin b/src/OS/os.h-Darwin
index af06bdcbcd6a0bbb7e07ad1c2ab3024827b4f86f..a85e92f0567f146d477bf3460bce4a7ae3ec84d4 100644 (file)
--- a/src/OS/os.h-Darwin
+++ b/src/OS/os.h-Darwin
@@ -6,9 +6,8 @@
 #define HAVE_SYS_MOUNT_H
 #define PAM_H_IN_PAM
 #define SIOCGIFCONF_GIVES_ADDR
+#define EXIM_HAVE_OPENAT
 
-/* OSX 10.2 does not have poll.h, 10.3 does emulate it badly. */
-#define NO_POLL_H
 
 #define F_FREESP     O_TRUNC
 typedef struct flock flock_t;
@@ -17,7 +16,7 @@ typedef struct flock flock_t;
                                Consider reducing MAX_LOCALHOST_NUMBER */
 
 #ifndef        _BSD_SOCKLEN_T_
-#define _BSD_SOCKLEN_T_ int32_t                 /* socklen_t (duh) */
+# define _BSD_SOCKLEN_T_ int32_t                 /* socklen_t (duh) */
 #endif
 
 /* Settings for handling IP options. There's no netinet/ip_var.h. The IP
@@ -36,7 +35,30 @@ updating Exim to use the newer interface. */
 #define DYNLIB_FN_EXT "dylib"
 
 /* We currently need some assistance getting OFF_T_FMT correct on MacOS */
-#define OFF_T_FMT "%llu"
+#ifdef OFF_T_FMT
+# undef OFF_T_FMT
+#endif
+#define OFF_T_FMT "%lld"
 #define LONGLONG_T long int
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
+/* seems arpa/nameser.h does not define this */
+#define NS_MAXMSG 65535
+
+/* There may be very many supplementary groups for the user. See notes
+in "man 2 getgroups". */
+#define _DARWIN_UNLIMITED_GETGROUPS
+#define EXIM_GROUPLIST_SIZE 64
+
+/* TCP Fast Open: Darwin uses a connectx() call
+rather than a modified sendto() */
+#define EXIM_TFO_CONNECTX
+
+/* MacOS, at least on the buildfarm animal, does not seem to push out
+the SMTP response to QUIT with our usual handling which is trying to get
+the client to FIN first so that the server does not get the TIME_WAIT */
+#define SERVERSIDE_CLOSE_NOWAIT
+
 /* End */