Log additional command-history on too-many-syntax-errors

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

diff --git a/src/src/dmarc.h b/src/src/dmarc.h
index 356a8e423aad8b79513f119d41e3942bd3cab2d3..c94d939cc05f12662a613bd9553d81f4a1408ece 100644 (file)
--- 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
@@ -59,6 +58,4 @@ void dmarc_send_forensic_report(u_char **);
 #define ARES_RESULT_UNKNOWN 11
 #define ARES_RESULT_DISCARD 12
 
-#endif /* EXPERIMENTAL_DMARC */
-
-// vim:sw=2 expandtab
+#endif /* SUPPORT_DMARC */