From e9ae2091541400df1d74a2e4ade73ce8c8f51a3e Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 14 Aug 2019 13:32:11 +0100 Subject: [PATCH 1/1] Testsuite: not all builds include SPF --- test/rejectlog/4600 | 4 ++++ test/runtest | 3 +++ test/stderr/0275 | 4 ---- test/stderr/0303 | 8 -------- test/stderr/0371 | 4 ---- test/stderr/0433 | 18 ------------------ test/stderr/0438 | 6 ------ test/stderr/0479 | 4 ---- test/stderr/0487 | 4 ---- test/stderr/1007 | 24 ------------------------ test/stderr/3400 | 4 ---- 11 files changed, 7 insertions(+), 76 deletions(-) create mode 100644 test/rejectlog/4600 diff --git a/test/rejectlog/4600 b/test/rejectlog/4600 new file mode 100644 index 000000000..e989ff7b7 --- /dev/null +++ b/test/rejectlog/4600 @@ -0,0 +1,4 @@ + +******** SERVER ******** +1999-03-02 09:44:33 H=(testclient) [ip4.ip4.ip4.ip4] F= rejected RCPT +1999-03-02 09:44:33 H=(testclient) [127.0.0.1] F= rejected RCPT diff --git a/test/runtest b/test/runtest index f083df99e..8f6bd28b8 100755 --- a/test/runtest +++ b/test/runtest @@ -1203,6 +1203,9 @@ RESET_AFTER_EXTRA_LINE_READ: # Not all platforms build with DKIM enabled next if /^PDKIM >> Body data for hash, canonicalized/; + # Not all platforms build with SPF enabled + next if /^(spf_conn_init|SPF_dns_exim_new|spf_compile\.c)/; + # Not all platforms have sendfile support next if /^cannot use sendfile for body: no support$/; diff --git a/test/stderr/0275 b/test/stderr/0275 index a10784724..af5aaef50 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -361,10 +361,6 @@ test in helo_lookup_domains? no (end of list) sender_fullhost = (test) [127.0.0.1] sender_rcvhost = [127.0.0.1] (helo=test) set_process_info: pppp handling incoming connection from (test) [127.0.0.1] -spf_conn_init: test 127.0.0.1 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 SMTP>> 250 myhost.test.ex Hello test [127.0.0.1] SMTP<< MAIL FROM: spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 diff --git a/test/stderr/0303 b/test/stderr/0303 index f4efb6a8c..3ed99b66b 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -68,10 +68,6 @@ SMTP<< EHLO [V4NET.2.3.4] sender_fullhost = ([V4NET.2.3.4]) [V4NET.2.3.4] sender_rcvhost = [V4NET.2.3.4] set_process_info: pppp handling incoming connection from ([V4NET.2.3.4]) [V4NET.2.3.4] -spf_conn_init: [V4NET.2.3.4] V4NET.2.3.4 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 host in dsn_advertise_hosts? no (option unset) host in pipelining_advertise_hosts? yes (matched "*") host in chunking_advertise_hosts? no (end of list) @@ -146,10 +142,6 @@ SMTP<< EHLO [V4NET.2.3.4] sender_fullhost = host.name.tld [V4NET.2.3.4] sender_rcvhost = host.name.tld ([V4NET.2.3.4]) set_process_info: pppp handling incoming connection from host.name.tld [V4NET.2.3.4] -spf_conn_init: [V4NET.2.3.4] V4NET.2.3.4 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 host in dsn_advertise_hosts? no (option unset) host in pipelining_advertise_hosts? yes (matched "*") host in chunking_advertise_hosts? no (end of list) diff --git a/test/stderr/0371 b/test/stderr/0371 index 105e589f0..1546b0279 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -35,10 +35,6 @@ something in helo_lookup_domains? no (end of list) sender_fullhost = (something) [V4NET.0.0.0] sender_rcvhost = [V4NET.0.0.0] (helo=something) set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0] -spf_conn_init: something V4NET.0.0.0 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 host in dsn_advertise_hosts? no (option unset) host in pipelining_advertise_hosts? yes (matched "*") host in chunking_advertise_hosts? no (end of list) diff --git a/test/stderr/0433 b/test/stderr/0433 index df91b7031..d0f69f0cb 100644 --- a/test/stderr/0433 +++ b/test/stderr/0433 @@ -14,9 +14,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -34,9 +31,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -55,9 +49,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4) set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4) -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -76,9 +67,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -98,9 +86,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1227 (IPv4) set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1227 (IPv4) -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -120,8 +105,5 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... diff --git a/test/stderr/0438 b/test/stderr/0438 index a9db0031b..f44d7bb76 100644 --- a/test/stderr/0438 +++ b/test/stderr/0438 @@ -16,9 +16,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -37,8 +34,5 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... diff --git a/test/stderr/0479 b/test/stderr/0479 index 1ec4bce8a..d62ca39f3 100644 --- a/test/stderr/0479 +++ b/test/stderr/0479 @@ -27,10 +27,6 @@ SMTP<< helo [1.2.3.4] sender_fullhost = ([1.2.3.4]) [1.2.3.4] sender_rcvhost = [1.2.3.4] set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4] -spf_conn_init: [1.2.3.4] 1.2.3.4 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4] SMTP<< mail from: spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 diff --git a/test/stderr/0487 b/test/stderr/0487 index 5aa280068..887f78ef5 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -19,10 +19,6 @@ LOG: smtp_connection MAIN SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< ehlo x.y -spf_conn_init: x.y NULL -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") in chunking_advertise_hosts? no (end of list) diff --git a/test/stderr/1007 b/test/stderr/1007 index 80051cd19..ad5f748f9 100644 --- a/test/stderr/1007 +++ b/test/stderr/1007 @@ -15,9 +15,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -37,9 +34,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -60,9 +54,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -83,9 +74,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -103,9 +91,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]:{1225,1226} set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]:{1225,1226} -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -126,9 +111,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1227 (IPv6 and IPv4) [127.0.0.1]:1228 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1227 (IPv6 and IPv4) [127.0.0.1]:1228 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -150,9 +132,6 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:{1227,1225} set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:{1227,1225} -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... Exim version x.yz .... @@ -173,8 +152,5 @@ changed uid/gid: running as a daemon LOG: MAIN exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv4) set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv4) -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... diff --git a/test/stderr/3400 b/test/stderr/3400 index bb77c58ab..da04b7f37 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -432,10 +432,6 @@ testing.testing in helo_lookup_domains? no (end of list) sender_fullhost = (testing.testing) [10.0.0.5] sender_rcvhost = [10.0.0.5] (helo=testing.testing ident=CALLER) set_process_info: pppp handling incoming connection from (testing.testing) [10.0.0.5] U=CALLER -spf_conn_init: testing.testing 10.0.0.5 -SPF_dns_exim_new -spf_compile.c:523 Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R} -spf_compile.c:1210 Debug: Compiling record v=spf1 host in dsn_advertise_hosts? no (option unset) host in pipelining_advertise_hosts? yes (matched "*") host in "10.0.0.1"? no (end of list) -- 2.30.2