git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DANE: move to mainline
[exim.git]
/
src
/
src
/
exim.h
diff --git
a/src/src/exim.h
b/src/src/exim.h
index 9ae96b2a08989b45cbf978588eeedece2fcb79a0..54e8d002d218922cda33164080d585ad87952b43 100644
(file)
--- a/
src/src/exim.h
+++ b/
src/src/exim.h
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
6
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-492,6
+492,7
@@
config.h, mytypes.h, and store.h, so we don't need to mention them explicitly.
#include "macros.h"
#include "dbstuff.h"
#include "structs.h"
#include "macros.h"
#include "dbstuff.h"
#include "structs.h"
+#include "blob.h"
#include "globals.h"
#include "hash.h"
#include "functions.h"
#include "globals.h"
#include "hash.h"
#include "functions.h"
@@
-501,7
+502,7
@@
config.h, mytypes.h, and store.h, so we don't need to mention them explicitly.
#ifdef EXPERIMENTAL_BRIGHTMAIL
# include "bmi_spam.h"
#endif
#ifdef EXPERIMENTAL_BRIGHTMAIL
# include "bmi_spam.h"
#endif
-#ifdef
EXPERIMENTAL
_SPF
+#ifdef
SUPPORT
_SPF
# include "spf.h"
#endif
#ifdef EXPERIMENTAL_SRS
# include "spf.h"
#endif
#ifdef EXPERIMENTAL_SRS
@@
-551,10
+552,16
@@
union sockaddr_46 {
};
/* 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
-so that if USE_GNUTLS *is* set, we can assume SUPPORT_TLS is also set. */
+so that if USE_GNUTLS *is* set, we can assume SUPPORT_TLS is also set.
+Likewise, OSCP, AUTH_TLS and CERTNAMES cannot be supported. */
#ifndef SUPPORT_TLS
# undef USE_GNUTLS
#ifndef SUPPORT_TLS
# undef USE_GNUTLS
+# ifndef DISABLE_OCSP
+# define DISABLE_OCSP
+# endif
+# undef EXPERIMENTAL_CERTNAMES
+# undef AUTH_TLS
#endif
/* If SPOOL_DIRECTORY, LOG_FILE_PATH or PID_FILE_PATH have not been defined,
#endif
/* If SPOOL_DIRECTORY, LOG_FILE_PATH or PID_FILE_PATH have not been defined,
@@
-586,9
+593,15
@@
default to EDQUOT if it exists, otherwise ENOSPC. */
#endif
/* DANE w/o DNSSEC is useless */
#endif
/* DANE w/o DNSSEC is useless */
-#if defined(
EXPERIMENTAL
_DANE) && defined(DISABLE_DNSSEC)
+#if defined(
SUPPORT
_DANE) && defined(DISABLE_DNSSEC)
# undef DISABLE_DNSSEC
#endif
# undef DISABLE_DNSSEC
#endif
+/* Some platforms (FreeBSD, OpenBSD, Solaris) do not seem to define this */
+
+#ifndef POLLRDHUP
+# define POLLRDHUP (POLLIN | POLLHUP)
+#endif
+
#endif
/* End of exim.h */
#endif
/* End of exim.h */