[exim-cvs] ARC: relax restriction on building without SPF

Gitweb: https://git.exim.org/exim.git/commitdiff/2b2cfa838f206b5d97a120722861f42780bc6a6a

Commit:     2b2cfa838f206b5d97a120722861f42780bc6a6a
Parent:     30795c5e77e21e90f3c695e6274bc9b4a9b68900
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Nov 4 11:43:20 2019 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Nov 4 11:43:20 2019 +0000

    ARC: relax restriction on building without SPF
---
 doc/doc-txt/experimental-spec.txt | 7 +++++++
 src/src/arc.c                     | 7 ++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index 373d9dc..3b8a734 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 b7fcb11..52c1c76 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
*/