Transport: fix smtp under combo of mua_wrapper and limited max_rcpt

[exim.git] / src / src / dmarc.h

diff --git a/src/src/dmarc.h b/src/src/dmarc.h
index fa0365e5506fe199ac7d1b0f43d9e2268dac07d8..78e2a5b7b7e0d5e31605811353335087a5c2f1b4 100644 (file)
--- a/src/src/dmarc.h
+++ b/src/src/dmarc.h
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Experimental DMARC support.
 *************************************************/
 
 /* 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;
    License: GPL */
 
 /* Portions Copyright (c) 2012, 2013, The Trusted Domain Project;


@@ -11,10 +11,10 @@
 
 #ifdef EXPERIMENTAL_DMARC
 
 
 #ifdef EXPERIMENTAL_DMARC
 

-#include "opendmarc/dmarc.h"
-#ifdef EXPERIMENTAL_SPF
-#include "spf2/spf.h"
-#endif /* EXPERIMENTAL_SPF */
+# include "opendmarc/dmarc.h"
+# ifdef EXPERIMENTAL_SPF
+#  include "spf2/spf.h"
+# endif /* EXPERIMENTAL_SPF */

 
 /* prototypes */
 int dmarc_init();
 
 /* prototypes */
 int dmarc_init();


@@ -24,7 +24,6 @@ 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();
 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 **);

 
 #define DMARC_AR_HEADER        US"Authentication-Results:"
 #define DMARC_VERIFY_STATUS    1
 
 #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
 
 #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 /* EXPERIMENTAL_DMARC */