Add verification glue code

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

diff --git a/src/src/receive.c b/src/src/receive.c
index 02fd8922fd7ae47aee4defbf4f81ca810c94cf7d..82e64a28ae6e87767091c45b147ca199e97ec068 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.1 2009/02/24 15:57:55 tom Exp $ */
+/* $Cambridge: exim/src/src/receive.c,v 1.45.2.2 2009/04/09 13:57:21 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1385,9 +1385,9 @@ message_linecount = body_linecount = body_zerocount =
   max_received_linelength = 0;
 
 #ifndef DISABLE_DKIM
-/* Call into DKIM to set up the context. Check if DKIM is to be run are carried out
-   inside dkim_exim_verify_init(). */
-dkim_exim_verify_init();
+/* 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;
 #endif
 
 
@@ -2971,7 +2971,7 @@ else
     {
 
 #ifndef DISABLE_DKIM
-    dkim_exim_verify_finish();
+    if (dkim_do_verify) dkim_do_verify = dkim_exim_verify_finish();
 #endif
 
 #ifdef WITH_CONTENT_SCAN