More DKIM wip. I now have a plan, and we are slowly getting there ...

[users/jgh/exim.git] / src / src / receive.c

diff --git a/src/src/receive.c b/src/src/receive.c
index 82e64a28ae6e87767091c45b147ca199e97ec068..dba469cbc125dc0f7b30a84ebb0af11f742ada87 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/receive.c,v 1.45.2.2 2009/04/09 13:57:21 tom Exp $ */
+/* $Cambridge: exim/src/src/receive.c,v 1.45.2.3 2009/05/20 14:30:14 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1386,11 +1386,9 @@ message_linecount = body_linecount = body_zerocount =
 
 #ifndef DISABLE_DKIM
 /* Call into DKIM to set up the context. */
-if (smtp_input && dkim_do_verify) dkim_do_verify = dkim_exim_verify_init();
-else dkim_do_verify = 0;
+if (smtp_input && !smtp_batched_input && !dkim_disable_verify) dkim_exim_verify_init();
 #endif
 
-
 /* Remember the time of reception. Exim uses time+pid for uniqueness of message
 ids, and fractions of a second are required. See the comments that precede the
 message id creation below. */
@@ -2971,7 +2969,7 @@ else
     {
 
 #ifndef DISABLE_DKIM
-    if (dkim_do_verify) dkim_do_verify = dkim_exim_verify_finish();
+    if (!dkim_disable_verify) dkim_exim_verify_finish();
 #endif
 
 #ifdef WITH_CONTENT_SCAN