From: Jeremy Harris <jgh146exb@wizmail.org>
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/exim.git/commitdiff_plain/da45993f49e890de3642db3f4c8bddbdb5302277

Merge branch 'callout_auth'
---

da45993f49e890de3642db3f4c8bddbdb5302277
diff --cc test/stderr/5420
index e711184f5,e711184f5..1e4de9688
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@@ -86,6 -86,6 +86,7 @@@ expanding: ${if eq {$address_data}{user
           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 -218,6 +219,7 @@@ skipping: result is not use
  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 -350,6 +352,7 @@@ skipping: result is not use
  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>