X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/54c5ebb14ead7439af300e9d7d9d7d2ba29ff32e..0e42da1b15894b66e3726d8ce0e41e25bdc21149:/test/stderr/0432?ds=sidebyside diff --git a/test/stderr/0432 b/test/stderr/0432 index 073340a0d..00dfde26a 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -22,7 +22,8 @@ MUNGED: ::1 will be omitted in what follows >>> ... callout omitted by default when host testing >>> (Use -bhc if you want the callouts to happen.) >>> ----------- end verify ------------ ->>> accept: condition test succeeded +>>> accept: condition test succeeded in ACL "mail" +>>> end of ACL "mail": ACCEPT Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -30,6 +31,7 @@ configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp +DSN: r1 propagating DSN originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [1.2.3.4] @@ -45,7 +47,7 @@ host in recipient_unqualified_hosts? no (option unset) host in helo_verify_hosts? no (option unset) host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: using ACL "mail" @@ -89,8 +91,10 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 server ready - SMTP>> HELO myhost.test.ex +127.0.0.1 in hosts_avoid_esmtp? no (option unset) + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK +127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: @@ -108,10 +112,11 @@ dbfn_write: key=x@y wrote positive callout cache address record ----------- end verify ------------ sender x@y verified ok -accept: condition test succeeded -SMTP>> 250 OK +accept: condition test succeeded in ACL "mail" +end of ACL "mail": ACCEPT +SMTP>> 250 OK SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [1.2.3.4] closed by QUIT search_tidyup called @@ -123,6 +128,7 @@ configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp +DSN: r1 propagating DSN originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [1.2.3.4] @@ -138,7 +144,7 @@ host in recipient_unqualified_hosts? no (option unset) host in helo_verify_hosts? no (option unset) host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: using ACL "mail" @@ -182,10 +188,11 @@ callout cache: found address record callout cache: address record is positive ----------- end verify ------------ sender x@y verified ok -accept: condition test succeeded -SMTP>> 250 OK +accept: condition test succeeded in ACL "mail" +end of ACL "mail": ACCEPT +SMTP>> 250 OK SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [1.2.3.4] closed by QUIT search_tidyup called @@ -215,7 +222,8 @@ MUNGED: ::1 will be omitted in what follows >>> callout cache: found address record >>> callout cache: address record is positive >>> ----------- end verify ------------ ->>> accept: condition test succeeded +>>> accept: condition test succeeded in ACL "mail" +>>> end of ACL "mail": ACCEPT >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -242,8 +250,10 @@ MUNGED: ::1 will be omitted in what follows >>> interface=NULL port=1224 >>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected >>> SMTP<< 220 server ready ->>> SMTP>> HELO myhost.test.ex +>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) +>>> SMTP>> EHLO myhost.test.ex >>> SMTP<< 250 OK +>>> 127.0.0.1 in hosts_require_auth? no (option unset) >>> SMTP>> MAIL FROM:<> >>> SMTP<< 250 OK >>> SMTP>> RCPT TO: @@ -253,7 +263,8 @@ MUNGED: ::1 will be omitted in what follows >>> result=1 postmaster=0 random=0 >>> wrote positive callout cache address record >>> ----------- end verify ------------ ->>> accept: condition test succeeded +>>> accept: condition test succeeded in ACL "mail" +>>> end of ACL "mail": ACCEPT >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -280,9 +291,10 @@ MUNGED: ::1 will be omitted in what follows >>> interface=NULL port=1224 >>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected >>> SMTP<< 220 server ready ->>> SMTP>> HELO myhost.test.ex +>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) +>>> SMTP>> EHLO myhost.test.ex >>> SMTP timeout >>> ----------- end verify ------------ ->>> accept: condition test deferred +>>> accept: condition test deferred in ACL "mail" LOG: H=[1.2.3.4] sender verify defer for : Could not complete sender verify callout LOG: H=[1.2.3.4] temporarily rejected MAIL : Could not complete sender verify callout