CHUNKING/DKIM: fix handling of lines having a leading dot

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

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 8994c6edb8d2b242861987c97be2f6c4a54aca20..34481aef73229c5e5a83b838db771c75f66e821b 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -352,15 +352,15 @@ if (smtp_inptr >= smtp_inend)
 return *smtp_inptr++;
 }
 
-#ifndef DISABLE_DKIM
 void
 smtp_get_cache(void)
 {
+#ifndef DISABLE_DKIM
 int n = smtp_inend - smtp_inptr;
 if (n > 0)
   dkim_exim_verify_feed(smtp_inptr, n);
-}
 #endif
+}
 
 
 /* Get a byte from the smtp input, in CHUNKING mode.  Handle ack of the
@@ -399,7 +399,7 @@ for(;;)
   if (chunking_state == CHUNKING_LAST)
     {
 #ifndef DISABLE_DKIM
-    dkim_exim_verify_feed(".\r\n", 3); /* for consistency with .-term MAIL */
+    dkim_exim_verify_feed(NULL, 0);    /* notify EOD */
 #endif
     return EOD;
     }