diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-08-20 20:22:21 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-08-20 20:22:21 +0100 |
| commit | a1bccd48f3956b50a13a34f5aed4b72c658c61af (patch) | |
| tree | c2f216cea6f67db514741d89631ef11aa25abc09 /test/stderr/0063 | |
| parent | d8129d876786c938f06dfbe91e51ebe36f09ae43 (diff) | |
| parent | a7538db17824b7fd70c12ef7561a67b85d6f247e (diff) | |
Merge branch 'master' into dane
Conflicts:
doc/doc-txt/ChangeLog
src/src/tls-openssl.c
src/src/transports/smtp.c
src/src/verify.c
Diffstat (limited to 'test/stderr/0063')
| -rw-r--r-- | test/stderr/0063 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/stderr/0063 b/test/stderr/0063 index 2eb0b3160..16cf4808a 100644 --- a/test/stderr/0063 +++ b/test/stderr/0063 @@ -12,6 +12,7 @@ >>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex") >>> test.ex in "+local_domains"? yes (matched "+local_domains") >>> accept: condition test succeeded in ACL "check_recipient" +>>> end of ACL "check_recipient": ACCEPT >>> using ACL "check_recipient" >>> processing "accept" >>> check domains = +local_domains @@ -39,6 +40,7 @@ MUNGED: ::1 will be omitted in what follows >>> processing "deny" >>> message: relay not permitted >>> deny: condition test succeeded in ACL "check_recipient" +>>> end of ACL "check_recipient": DENY LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) @@ -55,6 +57,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1 >>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex") >>> test.ex in "+local_domains"? yes (matched "+local_domains") >>> accept: condition test succeeded in ACL "check_recipient" +>>> end of ACL "check_recipient": ACCEPT >>> using ACL "check_recipient" >>> processing "accept" >>> check domains = +local_domains @@ -79,4 +82,5 @@ MUNGED: ::1 will be omitted in what follows >>> host in "^[^\d]+2"? yes (matched "^[^\d]+2") >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" +>>> end of ACL "check_recipient": ACCEPT LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss |