As client, request PRDR by default if the server offers it

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 0047f6bde7d00b500febf939d308ee6eb6ac076f..542ccaf8644232b56fa70e4289080d360d6a8d25 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -13546,8 +13546,9 @@ This option defines the ACL that is run after an SMTP DATA command has been
 processed and the message itself has been received, but before the final
 acknowledgment is sent. See chapter &<<CHAPACL>>& for further details.
 
 processed and the message itself has been received, but before the final
 acknowledgment is sent. See chapter &<<CHAPACL>>& for further details.
 

-.option acl_smtp_data_prdr main string&!! unset
-.cindex "DATA" "ACL for"
+.option acl_smtp_data_prdr main string&!! accept
+.cindex "PRDR" "ACL for"
+.cindex "DATA" "PRDR ACL for"

 .cindex "&ACL;" "PRDR-related"
 .cindex "&ACL;" "per-user data processing"
 This option defines the ACL that,
 .cindex "&ACL;" "PRDR-related"
 .cindex "&ACL;" "per-user data processing"
 This option defines the ACL that,


@@ -23162,11 +23163,12 @@ connects. If authentication fails, Exim will try to transfer the message
 unauthenticated. See also &%hosts_require_auth%&, and chapter
 &<<CHAPSMTPAUTH>>& for details of authentication.
 
 unauthenticated. See also &%hosts_require_auth%&, and chapter
 &<<CHAPSMTPAUTH>>& for details of authentication.
 

-.option hosts_try_prdr smtp "host list&!!" unset
+.option hosts_try_prdr smtp "host list&!!" *

 .cindex "PRDR" "enabling, optional in client"
 This option provides a list of servers to which, provided they announce
 PRDR support, Exim will attempt to negotiate PRDR
 for multi-recipient messages.
 .cindex "PRDR" "enabling, optional in client"
 This option provides a list of servers to which, provided they announce
 PRDR support, Exim will attempt to negotiate PRDR
 for multi-recipient messages.

+The option can usually be left as default.

 
 .option interface smtp "string list&!!" unset
 .cindex "bind IP address"
 
 .option interface smtp "string list&!!" unset
 .cindex "bind IP address"


@@ -26919,6 +26921,7 @@ This ACL is evaluated after &%acl_smtp_dkim%& but before &%acl_smtp_data%&.
 
 
 .section "The SMTP PRDR ACL" "SECTPRDRACL"
 
 
 .section "The SMTP PRDR ACL" "SECTPRDRACL"

+.cindex "PRDR" "ACL for"

 .oindex "&%prdr_enable%&"
 The &%acl_smtp_data_prdr%& ACL is available only when Exim is compiled
 with PRDR support enabled (which is the default).
 .oindex "&%prdr_enable%&"
 The &%acl_smtp_data_prdr%& ACL is available only when Exim is compiled
 with PRDR support enabled (which is the default).


@@ -26927,8 +26930,9 @@ client and server for a message, and more than one recipient
 has been accepted.
 
 The ACL test specfied by &%acl_smtp_data_prdr%& happens after a message
 has been accepted.
 
 The ACL test specfied by &%acl_smtp_data_prdr%& happens after a message

-has been recieved, and is executed for each recipient of the message.
-The test may accept or deny for inividual recipients.
+has been recieved, and is executed once for each recipient of the message
+with &$local_part$& and &$domain$& valid.
+The test may accept, defer or deny for inividual recipients.

 The &%acl_smtp_data%& will still be called after this ACL and
 can reject the message overall, even if this ACL has accepted it
 for some or all recipients.
 The &%acl_smtp_data%& will still be called after this ACL and
 can reject the message overall, even if this ACL has accepted it
 for some or all recipients.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 768d872e197905a07db1f8578ea31d3fb8687eb6..2f29e360370a9931a8b5a27b5f805608c7ca18b7 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -9,6 +9,9 @@ JH/01 Bug 1545: The smtp transport option "retry_include_ip_address" is now
 
 JH/02 The smtp transport option "multi_domain" is now expanded.
 
 
 JH/02 The smtp transport option "multi_domain" is now expanded.
 

+JH/03 The smtp transport now requests PRDR by default, if the server offers
+      it.
+

 
 Exim version 4.85
 -----------------
 
 Exim version 4.85
 -----------------

diff --git a/src/src/globals.c b/src/src/globals.c
index f7c67d76f4d864b76babdc307d42be7484ee373f..a7beec602370f78c1ac6ffd1e6b53c072d58f1fd 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -234,7 +234,7 @@ uschar *acl_smtp_auth          = NULL;
 uschar *acl_smtp_connect       = NULL;
 uschar *acl_smtp_data          = NULL;
 #ifndef DISABLE_PRDR
 uschar *acl_smtp_connect       = NULL;
 uschar *acl_smtp_data          = NULL;
 #ifndef DISABLE_PRDR

-uschar *acl_smtp_data_prdr     = NULL;
+uschar *acl_smtp_data_prdr     = US"accept";

 #endif
 #ifndef DISABLE_DKIM
 uschar *acl_smtp_dkim          = NULL;
 #endif
 #ifndef DISABLE_DKIM
 uschar *acl_smtp_dkim          = NULL;

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index f919508bcbafe9363ff020d2038e925a2b082999..3dae1d2f2a31c374d627f474cd73f9967c89dc1e 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -214,7 +214,7 @@ smtp_transport_options_block smtp_transport_option_defaults = {
   NULL,                /* hosts_require_dane */
 #endif
 #ifndef DISABLE_PRDR
   NULL,                /* hosts_require_dane */
 #endif
 #ifndef DISABLE_PRDR

-  NULL,                /* hosts_try_prdr */
+  US"*",                /* hosts_try_prdr */

 #endif
 #ifndef DISABLE_OCSP
   US"*",               /* hosts_request_ocsp (except under DANE; tls_client_start()) */
 #endif
 #ifndef DISABLE_OCSP
   US"*",               /* hosts_request_ocsp (except under DANE; tls_client_start()) */