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
Merge native DKIM support (from DEVEL_PDKIM)
[exim.git]
/
src
/
src
/
spool_in.c
diff --git
a/src/src/spool_in.c
b/src/src/spool_in.c
index 311d1833cdc3cacfc092ec5b95969ae68ca219be..1674e78f0efcc4bf40015da260670ee5772acd65 100644
(file)
--- a/
src/src/spool_in.c
+++ b/
src/src/spool_in.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/spool_in.c,v 1.2
3 2009/01/20 16:09:20 fanf2
Exp $ */
+/* $Cambridge: exim/src/src/spool_in.c,v 1.2
4 2009/06/10 07:34:04 tom
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-278,12
+278,10
@@
bmi_run = 0;
bmi_verdicts = NULL;
#endif
bmi_verdicts = NULL;
#endif
-#ifdef EXPERIMENTAL_DOMAINKEYS
-dk_do_verify = 0;
-#endif
-
-#ifdef EXPERIMENTAL_DKIM
-dkim_do_verify = 0;
+#ifndef DISABLE_DKIM
+dkim_signing_domains = NULL;
+dkim_disable_verify = FALSE;
+dkim_collect_input = FALSE;
#endif
#ifdef SUPPORT_TLS
#endif
#ifdef SUPPORT_TLS