git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Events: move from Experimental to mainline
[exim.git]
/
src
/
src
/
dmarc.h
diff --git
a/src/src/dmarc.h
b/src/src/dmarc.h
index 356a8e423aad8b79513f119d41e3942bd3cab2d3..63d451c5d44597e9d41099ffce6791407ea16c1b 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();
@@
-60,5
+60,3
@@
void dmarc_send_forensic_report(u_char **);
#define ARES_RESULT_DISCARD 12
#endif /* EXPERIMENTAL_DMARC */
#define ARES_RESULT_DISCARD 12
#endif /* EXPERIMENTAL_DMARC */
-
-// vim:sw=2 expandtab