From 79d49a69f0f4850d1fd60cfb720f0e811faf183e Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 15 Jan 2013 21:16:27 +0000 Subject: [PATCH] Fix acceptance log line for server PRDR case. Add PRDR to skeleton makefile. --- src/src/EDITME | 4 ++++ src/src/receive.c | 11 ++++++++++- test/log/5500 | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/src/EDITME b/src/src/EDITME index 95a0c02f4..7de915ae9 100644 --- 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 e6ebda802..4f259923c 100644 --- 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 e9e06a530..7d128c06f 100644 --- a/test/log/5500 +++ b/test/log/5500 @@ -2,6 +2,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 PRDR R= acceptance 1999-03-02 09:44:33 10HmaY-0005vi-00 PRDR R= temporary refusal 1999-03-02 09:44:33 10HmaY-0005vi-00 PRDR R= 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 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= acceptance -- 2.25.1