DANE: smtp transport option dane_require_tls_ciphers

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

diff --git a/src/src/receive.c b/src/src/receive.c
index d14409c5897db96c071d50bf499aeef4e579272c..6a534dc87c887ce38bf6e9adc5b6750042802b16 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1034,6 +1034,7 @@ for (;;)
     unsigned len = MAX(chunking_data_left, thismessage_size_limit - message_size + 1);
     uschar * buf = bdat_getbuf(&len);
 
+    if (!buf) return END_EOF;
     message_size += len;
     if (fout && fwrite(buf, len, 1, fout) != 1) return END_WERROR;
     }
@@ -3960,6 +3961,10 @@ if (LOGGING(8bitmime))
 #ifndef DISABLE_DKIM
 if (LOGGING(dkim) && dkim_verify_overall)
   g = string_append(g, 2, US" DKIM=", dkim_verify_overall);
+# ifdef EXPERIMENTAL_ARC
+if (LOGGING(dkim) && arc_state && Ustrcmp(arc_state, "pass") == 0)
+  g = string_catn(g, US" ARC", 4);
+# endif
 #endif
 
 if (LOGGING(receive_time))