X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Ftransports%2Fsmtp.c;h=bd1e20d7fc3a35667af2e79d9a71a71fc09ac1a2;hp=add425326420175ea3b212381995fbc8a8cb726a;hb=d51dbacf4da044f797cb4c07e026adc608f1bc98;hpb=c4b57fddcae8301f324d2626083c13b2c5e60521

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index add425326..bd1e20d7f 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -38,6 +38,10 @@ optionlist smtp_transport_options[] = {
       (void *)offsetof(smtp_transport_options_block, connect_timeout) },
   { "connection_max_messages", opt_int | opt_public,
       (void *)offsetof(transport_instance, connection_max_messages) },
+# ifdef SUPPORT_DANE
+  { "dane_require_tls_ciphers", opt_stringptr,
+      (void *)offsetof(smtp_transport_options_block, dane_require_tls_ciphers) },
+# endif
   { "data_timeout",         opt_time,
       (void *)offsetof(smtp_transport_options_block, data_timeout) },
   { "delay_after_cutoff", opt_bool,
@@ -225,6 +229,7 @@ smtp_transport_options_block smtp_transport_option_defaults = {
 #ifdef SUPPORT_DANE
   .hosts_try_dane =		NULL,
   .hosts_require_dane =		NULL,
+  .dane_require_tls_ciphers =	NULL,
 #endif
   .hosts_try_fastopen =		NULL,
 #ifndef DISABLE_PRDR
@@ -3224,8 +3229,11 @@ else
 #ifndef DISABLE_PRDR
       if (sx.prdr_active)
         {
+	const uschar * overall_message;
+
 	/* PRDR - get the final, overall response.  For any non-success
 	upgrade all the address statuses. */
+
         sx.ok = smtp_read_response(&sx.inblock, sx.buffer, sizeof(sx.buffer), '2',
           sx.ob->final_timeout);
         if (!sx.ok)
@@ -3241,7 +3249,14 @@ else
 	  goto RESPONSE_FAILED;
 	  }
 
-	/* Update the journal, or setup retry. */
+	/* Append the overall response to the individual PRDR response for logging
+	and update the journal, or setup retry. */
+
+	overall_message = string_printing(sx.buffer);
+        for (addr = addrlist; addr != sx.first_addr; addr = addr->next)
+	  if (addr->transport_return == OK)
+	    addr->message = string_sprintf("%s\\n%s", addr->message, overall_message);
+
         for (addr = addrlist; addr != sx.first_addr; addr = addr->next)
 	  if (addr->transport_return == OK)
 	    {