From: Jeremy Harris Date: Wed, 22 May 2013 17:49:49 +0000 (+0100) Subject: Merge branch 'callout_auth' X-Git-Tag: exim-4_82_RC1~28 X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/da45993f49e890de3642db3f4c8bddbdb5302277?hp=b4a2b536841292bde7e8e6dc6ef25d97a11641a3 Merge branch 'callout_auth' --- diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 842dd8ffd..800ef5ec1 100644 --- 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 e711184f5..1e4de9688 100644 --- 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: SMTP<< 250 OK SMTP>> RCPT TO: @@ -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: SMTP<< 250 OK SMTP>> RCPT TO: @@ -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: SMTP<< 250 OK SMTP>> RCPT TO: