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/0021 | |
| 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/0021')
| -rw-r--r-- | test/stderr/0021 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/stderr/0021 b/test/stderr/0021 index 3dbb81639..43331d4aa 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -28,6 +28,7 @@ check logwrite = $sender_host_address accepted by connect ACL LOG: MAIN 10.9.8.8 accepted by connect ACL accept: condition test succeeded in ACL "connect" +end of ACL "connect": ACCEPT using ACL "mail" processing "warn" message: added header line @@ -66,6 +67,7 @@ check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argu LOG: MAIN REJECT mail accepted "mail from:<ok@test1>" "<ok@test1>" accept: condition test succeeded in ACL "mail" +end of ACL "mail": ACCEPT using ACL "rcpt" processing "accept" check senders = +ok_senders @@ -82,6 +84,7 @@ check logwrite = :panic: rcpt accepted LOG: PANIC rcpt accepted accept: condition test succeeded in ACL "rcpt" +end of ACL "rcpt": ACCEPT using ACL "rcpt" processing "accept" check senders = +ok_senders @@ -95,6 +98,7 @@ check logwrite = :panic: rcpt accepted LOG: PANIC rcpt accepted accept: condition test succeeded in ACL "rcpt" +end of ACL "rcpt": ACCEPT LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -129,6 +133,7 @@ check logwrite = $sender_host_address accepted by connect ACL LOG: MAIN 10.9.8.8 accepted by connect ACL accept: condition test succeeded in ACL "connect" +end of ACL "connect": ACCEPT using ACL "mail" processing "warn" message: added header line @@ -153,6 +158,7 @@ check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argu LOG: MAIN REJECT mail accepted "mail from:<ok@test3>" "<ok@test3>" accept: condition test succeeded in ACL "mail" +end of ACL "mail": ACCEPT using ACL "rcpt" processing "accept" check senders = +ok_senders @@ -171,6 +177,7 @@ check logwrite = :panic: rcpt accepted LOG: PANIC rcpt accepted accept: condition test succeeded in ACL "rcpt" +end of ACL "rcpt": ACCEPT host in ignore_fromline_hosts? no (option unset) >>Headers added by MAIL or RCPT ACL: X-ACL-Warn: added header line |