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/0026 | |
| 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/0026')
| -rw-r--r-- | test/stderr/0026 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/stderr/0026 b/test/stderr/0026 index 328b169bd..26c27365d 100644 --- a/test/stderr/0026 +++ b/test/stderr/0026 @@ -8,6 +8,7 @@ >>> host in helo_accept_junk_hosts? no (option unset) >>> processing "accept" >>> accept: condition test succeeded in inline ACL +>>> end of inline ACL: ACCEPT >>> host in ignore_fromline_hosts? no (option unset) >>> using ACL "acl_data" >>> processing "deny" @@ -18,6 +19,7 @@ >>> processing "require" >>> check verify = header_syntax >>> require: condition test failed in ACL "acl_data" +>>> end of ACL "acl_data": not OK LOG: 10HmbH-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) @@ -29,6 +31,7 @@ LOG: 10HmbH-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o >>> host in helo_accept_junk_hosts? no (option unset) >>> processing "accept" >>> accept: condition test succeeded in inline ACL +>>> end of inline ACL: ACCEPT >>> host in ignore_fromline_hosts? no (option unset) >>> using ACL "acl_data" >>> processing "deny" @@ -36,4 +39,5 @@ LOG: 10HmbH-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o >>> check condition = ${if match{$message_body}{trigger}{yes}{no}} >>> = yes >>> deny: condition test succeeded in ACL "acl_data" +>>> end of ACL "acl_data": DENY LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: body contains trigger |