X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fdmarc.h;h=c94d939cc05f12662a613bd9553d81f4a1408ece;hb=46d2a5e6f6e7709d172903b13945d23fc0a2c888;hp=fa0365e5506fe199ac7d1b0f43d9e2268dac07d8;hpb=4840604e4f365545a43f01d0e953ce33afd1c3d5;p=exim.git

diff --git a/src/src/dmarc.h b/src/src/dmarc.h
index fa0365e55..c94d939cc 100644
--- a/src/src/dmarc.h
+++ b/src/src/dmarc.h
@@ -3,18 +3,18 @@
 *************************************************/
 
 /* Experimental DMARC support.
-   Copyright (c) Todd Lyons <tlyons@exim.org> 2012, 2013
+   Copyright (c) Todd Lyons <tlyons@exim.org> 2012 - 2014
    License: GPL */
 
 /* Portions Copyright (c) 2012, 2013, The Trusted Domain Project;
    All rights reserved, licensed for use per LICENSE.opendmarc. */
 
-#ifdef EXPERIMENTAL_DMARC
+#ifdef SUPPORT_DMARC
 
-#include "opendmarc/dmarc.h"
-#ifdef EXPERIMENTAL_SPF
-#include "spf2/spf.h"
-#endif /* EXPERIMENTAL_SPF */
+# include "opendmarc/dmarc.h"
+# ifdef SUPPORT_SPF
+#  include "spf2/spf.h"
+# endif /* SUPPORT_SPF */
 
 /* prototypes */
 int dmarc_init();
@@ -23,8 +23,7 @@ int dmarc_process();
 uschar *dmarc_exim_expand_query(int);
 uschar *dmarc_exim_expand_defaults(int);
 uschar *dmarc_auth_results_header(header_line *,uschar *);
-int dmarc_write_history_file();
-void dmarc_send_forensic_report(u_char **);
+static int dmarc_write_history_file();
 
 #define DMARC_AR_HEADER        US"Authentication-Results:"
 #define DMARC_VERIFY_STATUS    1
@@ -42,7 +41,21 @@ void dmarc_send_forensic_report(u_char **);
 #define DMARC_RESULT_TEMPFAIL   3
 #define DMARC_RESULT_QUARANTINE 4
 
-
-#endif
-
-// vim:sw=2 expandtab
+/* From opendmarc-ar.h */
+/* ARES_RESULT_T -- type for specifying an authentication result */
+#define ARES_RESULT_UNDEFINED   (-1)
+#define ARES_RESULT_PASS    0
+#define ARES_RESULT_UNUSED  1
+#define ARES_RESULT_SOFTFAIL    2
+#define ARES_RESULT_NEUTRAL 3
+#define ARES_RESULT_TEMPERROR   4
+#define ARES_RESULT_PERMERROR   5
+#define ARES_RESULT_NONE    6
+#define ARES_RESULT_FAIL    7
+#define ARES_RESULT_POLICY  8
+#define ARES_RESULT_NXDOMAIN    9
+#define ARES_RESULT_SIGNED  10
+#define ARES_RESULT_UNKNOWN 11
+#define ARES_RESULT_DISCARD 12
+
+#endif /* SUPPORT_DMARC */