Merge branch 'callout_auth'

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 842dd8ffd8a40cd8debe488f8b204a43b0ec9976..800ef5ec16f038dd6b90b03ec69de5106710f50f 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -35643,7 +35643,7 @@ has &%use_shell%& enabled.
 .next
 A number of options such as &%forbid_filter_run%&, &%forbid_filter_perl%&,
 &%forbid_filter_dlfunc%& and so forth which restrict facilities available to
-&_.forward_ files in a redirect router. If Exim is running on a central mail
+&_.forward_& files in a redirect router. If Exim is running on a central mail
 hub to which ordinary users do not have shell access, but home directories are
 NFS mounted (for instance) then administrators should review the list of these
 forbid options available, and should bear in mind that the options that may

diff --git a/test/stderr/5420 b/test/stderr/5420
index e711184f5c33bd20cb1658a63da30556d1aec180..1e4de9688b35756d7f84b869c1cc1c3b86e078a5 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -86,6 +86,7 @@ expanding: ${if eq {$address_data}{userz}{*}{:}}
          250-8BITMIME
          250-PIPELINING
          250 HELP
+127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<userx@domain.com>
@@ -218,6 +219,7 @@ skipping: result is not used
 expanding: ${if eq {$address_data}{usery}{*}{:}}
    result: *
 127.0.0.1 in hosts_avoid_tls? yes (matched "*")
+127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<usery@domain.com>
@@ -350,6 +352,7 @@ skipping: result is not used
 expanding: ${if eq {$address_data}{usery}{*}{:}}
    result: *
 127.0.0.1 in hosts_avoid_tls? yes (matched "*")
+127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<usery@domain.com>