X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fexim.h;h=e979175d178dfc50af2a8908f1444edb747a02f1;hp=d179ca671908fa8fc195ef8f722413a05deabe82;hb=52ba4661114d0a96c15f5f43bcb97ce89061f1b6;hpb=c988f1f4faa9f679f79beddf3c14676c5dcb8e28 diff --git a/src/src/exim.h b/src/src/exim.h index d179ca671..e979175d1 100644 --- a/src/src/exim.h +++ b/src/src/exim.h @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/exim.h,v 1.7 2005/01/04 10:00:42 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2009 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -17,6 +15,11 @@ most of these includes. */ #define HAVE_STATFS +/* Similarly, assume most systems have srandom() unless os.h undefines it. +This call dates back at least as far as SUSv2. */ + +#define HAVE_SRANDOM + /* First of all include the os-specific header, which might set things that are needed by any of the other headers, including system headers. */ @@ -49,6 +52,7 @@ making unique names. */ #include #include +#include #include #include #include @@ -60,7 +64,7 @@ making unique names. */ /* Unix includes */ #include -#if defined(__svr4__) && defined(__sparc) && ! defined(__EXTENSIONS__) +#if defined(__svr4__) && defined(__sparc) && ! defined(__EXTENSIONS__) #define __EXTENSIONS__ /* so that SunOS 5 gets NGROUPS_MAX */ #include #undef __EXTENSIONS__ @@ -74,6 +78,14 @@ making unique names. */ #define INT_MAX 2147483647 #endif +#ifndef INT_MIN +#define INT_MIN (-INT_MAX - 1) +#endif + +#ifndef SHRT_MAX +#define SHRT_MAX 32767 +#endif + #ifndef UCHAR_MAX #define UCHAR_MAX 255 #endif @@ -92,6 +104,9 @@ making unique names. */ #include #include #include +#ifndef NO_POLL_H +#include +#endif #include #include #include @@ -107,11 +122,12 @@ in sys/file.h. */ #include #endif -/* A few OS don't have socklen_t; their os.h files define SOCKLEN_T to -be size_t or whatever. */ +/* A few OS don't have socklen_t; their os.h files define EXIM_SOCKLEN_T to +be size_t or whatever. We used to use SOCKLEN_T, but then it was discovered +that this is used by the AIX include files. */ -#ifndef SOCKLEN_T -#define SOCKLEN_T socklen_t +#ifndef EXIM_SOCKLEN_T +#define EXIM_SOCKLEN_T socklen_t #endif /* Ensure that the sysexits we reference are defined */ @@ -206,7 +222,7 @@ or a macro with entries f_frsize and f_bsize. */ #endif -#ifndef SIOCGIFCONF /* HACK for SunOS 5 */ +#ifndef SIOCGIFCONF /* HACK for SunOS 5 */ #include #endif @@ -216,23 +232,19 @@ or a macro with entries f_frsize and f_bsize. */ #include /* There's a shambles in IRIX6 - it defines EX_OK in unistd.h which conflicts -with the definition in sysexits.h. Arrange to preserve it, even though at -present Exim doesn't actually use it. */ +with the definition in sysexits.h. Exim does not actually use this macro, so we +just undefine it. It would be nice to be able to re-instate the definition from +sysexits.h if there is no definition in unistd.h, but I do not think there is a +way to do this in C because macro definitions are not scanned for other macros +at definition time. [The code here used to assume they were, until I was +disabused of the notion. Luckily, since EX_OK is not used, it didn't matter.] */ #ifdef EX_OK -#define SAVE_EX_OK EX_OK #undef EX_OK #endif #include -#ifdef SAVE_EX_OK -#ifdef EX_OK -#undef EX_OK -#endif -#define EX_OK SAVE_EX_OK -#endif - #include #ifndef NO_NET_IF_H #include @@ -278,12 +290,48 @@ header files. I don't suppose they have T_SRV either. */ #define T_SRV 33 #endif -/* We use the private type T_ZNS for retrieving the nameservers for the -enclosing zone of a domain, and the private type T_MXH for retrieving -the MX hostnames only (without their priorities). */ +/* 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. */ + +#ifndef T_A +#define T_A 1 +#endif + +#ifndef T_CNAME +#define T_CNAME 5 +#endif + +#ifndef T_SOA +#define T_SOA 6 +#endif + +#ifndef T_MX +#define T_MX 15 +#endif + +#ifndef T_NS +#define T_NS 2 +#endif + +#ifndef T_PTR +#define T_PTR 12 +#endif + + +/* We define a few private types for special DNS lookups: + + . T_ZNS gets the nameservers of the enclosing zone of a domain + + . T_MXH gets the MX hostnames only (without their priorities) + + . T_CSA gets the domain's Client SMTP Authorization SRV record + +*/ #define T_ZNS (-1) #define T_MXH (-2) +#define T_CSA (-3) /* 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 @@ -377,12 +425,11 @@ extern int ferror(FILE *); /* The header from the PCRE regex package */ -#include "pcre/pcre.h" +#include /* Exim includes are in several files. Note that local_scan.h #includes -mytypes.h and store.h, so we don't need to mention them explicitly. */ - -#include "config.h" +config.h, mytypes.h, and store.h, so we don't need to mention them explicitly. +*/ #include "local_scan.h" #include "macros.h" @@ -402,6 +449,9 @@ mytypes.h and store.h, so we don't need to mention them explicitly. */ #ifdef EXPERIMENTAL_SRS #include "srs.h" #endif +#ifndef DISABLE_DKIM +#include "dkim.h" +#endif /* The following stuff must follow the inclusion of config.h because it requires various things that are set therein. */ @@ -410,10 +460,16 @@ requires various things that are set therein. */ #include #endif -#ifdef USE_READLINE +#if defined(USE_READLINE) || defined(EXPAND_DLFUNC) || defined (LOOKUP_MODULE_DIR) #include #endif +#ifdef ENABLE_DISABLE_FSYNC +#define EXIMfsync(f) (disable_fsync? 0 : fsync(f)) +#else +#define EXIMfsync(f) fsync(f) +#endif + /* Backward compatibility; LOOKUP_LSEARCH now includes all three */ #if (!defined LOOKUP_LSEARCH) && (defined LOOKUP_WILDLSEARCH || defined LOOKUP_NWILDLSEARCH) @@ -421,13 +477,15 @@ requires various things that are set therein. */ #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 + struct sockaddr v0; }; /* If SUPPORT_TLS is not defined, ensure that USE_GNUTLS is also not defined @@ -475,5 +533,12 @@ default to EDQUOT if it exists, otherwise ENOSPC. */ #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 */