summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2019-11-04 11:43:20 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2019-11-04 11:43:20 +0000
commit2b2cfa838f206b5d97a120722861f42780bc6a6a (patch)
tree0edf89691efdec895d2df1f47a5ac31e1ea7c796
parent30795c5e77e21e90f3c695e6274bc9b4a9b68900 (diff)
ARC: relax restriction on building without SPF
-rw-r--r--doc/doc-txt/experimental-spec.txt7
-rw-r--r--src/src/arc.c7
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index 373d9dc4c..3b8a73428 100644
--- a/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@ -585,6 +585,13 @@ identify the ADMD. Messages should be ARC-verified on entry to the ADMD,
and ARC-signed on exit from it.
+Building with ARC Support
+--
+Enable using EXPERIMENTAL_ARC=yes in your Local/Makefile.
+You must also have DKIM present (not disabled), and you very likely
+want to have SPF enabled.
+
+
Verification
--
An ACL condition is provided to perform the "verifier actions" detailed
diff --git a/src/src/arc.c b/src/src/arc.c
index b7fcb116a..52c1c7625 100644
--- a/src/src/arc.c
+++ b/src/src/arc.c
@@ -7,10 +7,7 @@
*/
#include "exim.h"
-#ifdef EXPERIMENTAL_ARC
-# if !defined SUPPORT_SPF
-# error SPF must also be enabled for ARC
-# elif defined DISABLE_DKIM
+# if defined DISABLE_DKIM
# error DKIM must also be enabled for ARC
# else
@@ -1862,7 +1859,7 @@ return g;
}
-# endif /* SUPPORT_SPF */
+# endif /* DISABLE_DKIM */
#endif /* EXPERIMENTAL_ARC */
/* vi: aw ai sw=2
*/