Merge tag 'exim-4_82_1'

[exim.git] / src / src / exim.h

diff --git a/src/src/exim.h b/src/src/exim.h
index be7c55e88f888a2ac1662ede835808333546bb1f..b824b48f30bd7c4160b3f37ba1e5a5f637c3fb52 100644 (file)
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/exim.h,v 1.27 2009/11/16 19:50:36 nm4 Exp $ */
-

 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) University of Cambridge 1995 - 2014 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 
 /* See the file NOTICE for conditions of use and distribution. */
 
 


@@ -22,6 +20,13 @@ This call dates back at least as far as SUSv2. */
 
 #define HAVE_SRANDOM
 
 
 #define HAVE_SRANDOM
 

+/* This is primarily for the Gnu C library; we define it before os.h so that
+os.h has a chance to hurriedly undef it, Just In Case.  We need C99 for some
+64-bit math support, and defining _ISOC99_SOURCE breaks <resolv.h> and friends.
+*/
+
+#define _GNU_SOURCE 1
+

 /* First of all include the os-specific header, which might set things that
 are needed by any of the other headers, including system headers. */
 
 /* First of all include the os-specific header, which might set things that
 are needed by any of the other headers, including system headers. */
 


@@ -50,6 +55,11 @@ making unique names. */
 #define LOCALHOST_MAX  10
 #endif
 
 #define LOCALHOST_MAX  10
 #endif
 

+/* If not overridden by os.h, dynamic libraries have filenames ending .so */
+#ifndef DYNLIB_FN_EXT
+# define DYNLIB_FN_EXT "so"
+#endif
+

 /* ANSI C standard includes */
 
 #include <ctype.h>
 /* ANSI C standard includes */
 
 #include <ctype.h>


@@ -74,6 +84,10 @@ making unique names. */
 #include <limits.h>
 #endif
 
 #include <limits.h>
 #endif
 

+/* C99 integer types, figure out how to undo this if needed for older systems */
+
+#include <inttypes.h>
+

 /* Just in case some aged system doesn't define them... */
 
 #ifndef INT_MAX
 /* Just in case some aged system doesn't define them... */
 
 #ifndef INT_MAX


@@ -92,6 +106,15 @@ making unique names. */
 #define UCHAR_MAX 255
 #endif
 
 #define UCHAR_MAX 255
 #endif
 

+
+/* To match int_eximarith_t.  Define in OS/os.h-<your-system> to override. */
+#ifndef EXIM_ARITH_MAX
+# define EXIM_ARITH_MAX ((int_eximarith_t)9223372036854775807LL)
+#endif
+#ifndef EXIM_ARITH_MIN
+# define EXIM_ARITH_MIN (-EXIM_ARITH_MAX - 1)
+#endif
+

 /* Some systems have PATH_MAX and some have MAX_PATH_LEN. */
 
 #ifndef PATH_MAX
 /* Some systems have PATH_MAX and some have MAX_PATH_LEN. */
 
 #ifndef PATH_MAX


@@ -292,6 +315,18 @@ header files. I don't suppose they have T_SRV either. */
 #define T_SRV 33
 #endif
 
 #define T_SRV 33
 #endif
 

+/* Many systems do not have T_SPF. */
+
+#ifndef T_SPF
+#define T_SPF 99
+#endif
+
+/* New TLSA record for DANE */
+#ifndef T_TLSA
+#define T_TLSA 52
+#endif
+#define MAX_TLSA_EXPANDED_SIZE 8192
+

 /* It seems that some versions of arpa/nameser.h don't define *any* of the
 T_xxx macros, which seem to be non-standard nowadays. Just to be on the safe
 side, put in definitions for all the ones that Exim uses. */
 /* It seems that some versions of arpa/nameser.h don't define *any* of the
 T_xxx macros, which seem to be non-standard nowadays. Just to be on the safe
 side, put in definitions for all the ones that Exim uses. */


@@ -334,6 +369,7 @@ side, put in definitions for all the ones that Exim uses. */
 #define T_ZNS (-1)
 #define T_MXH (-2)
 #define T_CSA (-3)
 #define T_ZNS (-1)
 #define T_MXH (-2)
 #define T_CSA (-3)

+#define T_APL (-4)

 
 /* The resolv.h header defines __P(x) on some Solaris 2.5.1 systems (without
 checking that it is already defined, in fact). This conflicts with other
 
 /* The resolv.h header defines __P(x) on some Solaris 2.5.1 systems (without
 checking that it is already defined, in fact). This conflicts with other


@@ -350,6 +386,17 @@ to undefine it if resolv.h defines it. */
 #undef __P
 #endif
 
 #undef __P
 #endif
 

+/* If not defined by os.h, we do nothing special to push DNS resolver state
+back to be available by the classic resolver routines.  Also, provide
+prototype for our get routine, unless defined away. */
+
+#ifndef os_put_dns_resolver_res
+# define os_put_dns_resolver_res(R) do {/**/} while(0)
+#endif
+#ifndef os_get_dns_resolver_res
+res_state os_get_dns_resolver_res(void);
+#endif
+

 /* These three are to support the IP option logging code. Linux is
 different to everyone else and there are also other systems which don't
 have netinet/ip_var.h, so there's a general macro to control its inclusion. */
 /* These three are to support the IP option logging code. Linux is
 different to everyone else and there are also other systems which don't
 have netinet/ip_var.h, so there's a general macro to control its inclusion. */


@@ -454,6 +501,10 @@ config.h, mytypes.h, and store.h, so we don't need to mention them explicitly.
 #ifndef DISABLE_DKIM
 #include "dkim.h"
 #endif
 #ifndef DISABLE_DKIM
 #include "dkim.h"
 #endif

+#ifdef EXPERIMENTAL_DMARC
+#include "dmarc.h"
+#include <opendmarc/dmarc.h>
+#endif

 
 /* The following stuff must follow the inclusion of config.h because it
 requires various things that are set therein. */
 
 /* The following stuff must follow the inclusion of config.h because it
 requires various things that are set therein. */


@@ -479,13 +530,15 @@ requires various things that are set therein. */
 #endif
 
 /* Define a union to hold either an IPv4 or an IPv6 sockaddr structure; this
 #endif
 
 /* Define a union to hold either an IPv4 or an IPv6 sockaddr structure; this

-simplifies some of the coding. */
+simplifies some of the coding.  We include the sockaddr to reduce type-punning
+issues in C99. */

 
 union sockaddr_46 {
   struct sockaddr_in v4;
   #if HAVE_IPV6
   struct sockaddr_in6 v6;
   #endif
 
 union sockaddr_46 {
   struct sockaddr_in v4;
   #if HAVE_IPV6
   struct sockaddr_in6 v6;
   #endif

+  struct sockaddr v0;

 };
 
 /* If SUPPORT_TLS is not defined, ensure that USE_GNUTLS is also not defined
 };
 
 /* If SUPPORT_TLS is not defined, ensure that USE_GNUTLS is also not defined


@@ -533,12 +586,4 @@ default to EDQUOT if it exists, otherwise ENOSPC. */
   #endif
 #endif
 
   #endif
 #endif
 

-/* These are for reporting version information from various componenents, to
-figure out what's actually happening. They need to be available to the main
-function, so we declare them here. Unfortunate. */
-
-#ifdef AUTH_CYRUS_SASL
-extern void auth_cyrus_sasl_version_report(FILE *);
-#endif
-

 /* End of exim.h */
 /* End of exim.h */