From b895f4b20b25f81cd6f94be75881d3328df03892 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 21 Jan 2017 18:54:56 +0000 Subject: Fix DKIM verify operation in -bh test mode. Bug 2017 --- test/stderr/0021 | 1 - test/stderr/0022 | 3 --- test/stderr/0386 | 2 -- test/stderr/0575 | 1 - test/stderr/4507 | 22 ++++++++++++++++++++++ 5 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 test/stderr/4507 (limited to 'test/stderr') diff --git a/test/stderr/0021 b/test/stderr/0021 index 43331d4aa..7c5a79ee9 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -178,7 +178,6 @@ 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 >> diff --git a/test/stderr/0022 b/test/stderr/0022 index 75c282029..bcafb8589 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -41,7 +41,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -host in ignore_fromline_hosts? no (option unset) >>Headers received: search_tidyup called @@ -113,7 +112,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -host in ignore_fromline_hosts? no (option unset) >>Headers received: search_tidyup called @@ -183,7 +181,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -host in ignore_fromline_hosts? no (option unset) >>Headers received: search_tidyup called diff --git a/test/stderr/0386 b/test/stderr/0386 index 00094863b..44e856da2 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -191,7 +191,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -host in ignore_fromline_hosts? no (option unset) >>Headers received: search_tidyup called @@ -373,7 +372,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -host in ignore_fromline_hosts? no (option unset) >>Headers received: search_tidyup called diff --git a/test/stderr/0575 b/test/stderr/0575 index 86620a896..210f868ad 100644 --- a/test/stderr/0575 +++ b/test/stderr/0575 @@ -35,7 +35,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -host in ignore_fromline_hosts? no (option unset) >>Headers received: search_tidyup called diff --git a/test/stderr/4507 b/test/stderr/4507 new file mode 100644 index 000000000..1df9537ea --- /dev/null +++ b/test/stderr/4507 @@ -0,0 +1,22 @@ + +******** SERVER ******** +>>> host in hosts_connection_nolog? no (option unset) +>>> host in host_lookup? no (option unset) +>>> host in host_reject_connection? no (option unset) +>>> host in sender_unqualified_hosts? no (option unset) +>>> 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) +>>> xxx in helo_lookup_domains? no (end of list) +>>> processing "accept" +>>> accept: condition test succeeded in inline ACL +>>> end of inline ACL: ACCEPT +>>> host in ignore_fromline_hosts? no (option unset) +LOG: 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [verification succeeded] +>>> processing "accept" +>>> check logwrite = signer: test.ex bits: 1024 +LOG: 10HmaX-0005vi-00 signer: test.ex bits: 1024 +>>> accept: condition test succeeded in inline ACL +>>> end of inline ACL: ACCEPT +LOG: 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net -- cgit v1.2.3