Fix acceptance log line for server PRDR case. Add PRDR to skeleton makefile.

diff --git a/src/src/EDITME b/src/src/EDITME
index 95a0c02f4dcd04ffd71cf3cf88f95caa02fbbf50..7de915ae9fd9981fe1095acd1c65ca9605f0e1c8 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -460,6 +460,10 @@ EXIM_MONITOR=eximon.bin
 
 # EXPERIMENTAL_OCSP=yes
 
+# Uncomment the following line to add Per-Recipient-Data-Response support.
+
+# EXPERIMENTAL_PRDR=yes
+
 
 
 ###############################################################################

diff --git a/src/src/receive.c b/src/src/receive.c
index e6ebda8024ff3ffb93f795f2d1ffbcb7583be7d8..4f259923c265d45045df56b761fb27481241a8d5 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -3709,6 +3709,11 @@ if (sender_host_authenticated != NULL)
     }
   }
 
+#ifdef EXPERIMENTAL_PRDR
+if (prdr_requested)
+  s = string_append(s, &size, &sptr, 1, US" PRDR");
+#endif
+
 sprintf(CS big_buffer, "%d", msg_size);
 s = string_append(s, &size, &sptr, 2, US" S=", big_buffer);
 
@@ -3925,7 +3930,11 @@ if(cutthrough_fd >= 0)
     }
   }
 
-if(smtp_reply == NULL)
+if(smtp_reply == NULL
+#ifdef EXPERIMENTAL_PRDR
+                     || prdr_requested
+#endif
+  )
   {
   log_write(0, LOG_MAIN |
     (((log_extra_selector & LX_received_recipients) != 0)? LOG_RECIPIENTS : 0) |

diff --git a/test/log/5500 b/test/log/5500
index e9e06a5309f9213e21d43cd0767e7f537084835e..7d128c06f8716c4a16cebb0af2c184d6e88f43c9 100644 (file)
--- a/test/log/5500
+++ b/test/log/5500
@@ -2,6 +2,7 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 PRDR R=<userx@test.ex> acceptance
 1999-03-02 09:44:33 10HmaY-0005vi-00 PRDR R=<usery@test.ex> temporary refusal
 1999-03-02 09:44:33 10HmaY-0005vi-00 PRDR R=<userz@test.ex> refusal
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=(rhu.barb) [127.0.0.1] P=esmtp PRDR S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r0 T=t1
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 PRDR R=<userp@test.ex> acceptance