From 898d150f9aa9c796bb01117bc438b24ddb2e7435 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Wed, 8 Mar 2006 10:49:18 +0000 Subject: [PATCH] Tidies to SMTP dialogue debugging output. --- doc/doc-txt/ChangeLog | 7 +++- src/src/auths/get_data.c | 3 +- src/src/smtp_in.c | 15 ++++++-- test/stderr/0002 | 4 +-- test/stderr/0022 | 36 +++++++++---------- test/stderr/0094 | 10 +++--- test/stderr/0277 | 20 +++++------ test/stderr/0294 | 76 ++++++++++++++++++++-------------------- test/stderr/0303 | 40 ++++++++++----------- test/stderr/0362 | 8 ++--- test/stderr/0371 | 24 ++++++------- test/stderr/0381 | 8 ++--- test/stderr/0386 | 36 +++++++++---------- test/stderr/0391 | 8 ++--- test/stderr/0396 | 8 ++--- test/stderr/0398 | 10 +++--- test/stderr/0420 | 20 +++++------ test/stderr/0432 | 12 +++---- test/stderr/0435 | 6 ++-- test/stderr/0464 | 8 ++--- test/stderr/0465 | 32 ++++++++--------- test/stderr/0479 | 12 +++---- test/stderr/0487 | 20 +++++------ test/stderr/2600 | 20 +++++------ test/stderr/3201 | 4 +-- test/stderr/3400 | 20 +++++------ 26 files changed, 242 insertions(+), 225 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 909570c9e..632e11189 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.324 2006/03/08 09:43:10 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.325 2006/03/08 10:49:18 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -291,6 +291,11 @@ JJ/08 exipick: added ! as generic prefix to negate any criteria format JJ/09 exipick: miscellaneous performance enhancements (~24% improvements) +PH/57 Tidies in SMTP dialogue display in debug output: (i) It was not showing + responses to authentication challenges, though it was showing the + challenges; (ii) I've removed the CR characters from the debug output for + SMTP output lines. + Exim version 4.60 ----------------- diff --git a/src/src/auths/get_data.c b/src/src/auths/get_data.c index a53381c39..f0df39ea7 100644 --- a/src/src/auths/get_data.c +++ b/src/src/auths/get_data.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/auths/get_data.c,v 1.3 2006/02/07 11:19:01 ph10 Exp $ */ +/* $Cambridge: exim/src/src/auths/get_data.c,v 1.4 2006/03/08 10:49:18 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -40,6 +40,7 @@ while ((c = receive_getc()) != '\n' && c != EOF) } if (p > 0 && big_buffer[p-1] == '\r') p--; big_buffer[p] = 0; +DEBUG(D_receive) debug_printf("SMTP<< %s\n", big_buffer); if (Ustrcmp(big_buffer, "*") == 0) return CANCELLED; *aptr = big_buffer; return OK; diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 224eba9f7..1ed5183a6 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/smtp_in.c,v 1.35 2006/03/06 16:05:12 ph10 Exp $ */ +/* $Cambridge: exim/src/src/smtp_in.c,v 1.36 2006/03/08 10:49:18 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -338,8 +338,13 @@ va_list ap; DEBUG(D_receive) { + uschar *cr, *end; va_start(ap, format); (void) string_vformat(big_buffer, big_buffer_size, format, ap); + va_end(ap); + end = big_buffer + Ustrlen(big_buffer); + while ((cr = Ustrchr(big_buffer, '\r')) != NULL) /* lose CRs */ + memmove(cr, cr + 1, (end--) - cr); debug_printf("SMTP>> %s", big_buffer); } @@ -2643,7 +2648,13 @@ while (done <= 0) #endif (void)fwrite(s, 1, ptr, smtp_out); - DEBUG(D_receive) debug_printf("SMTP>> %s", s); + DEBUG(D_receive) + { + uschar *cr; + while ((cr = Ustrchr(s, '\r')) != NULL) /* lose CRs */ + memmove(cr, cr + 1, (ptr--) - (cr - s)); + debug_printf("SMTP>> %s", s); + } helo_seen = TRUE; break; /* HELO/EHLO */ diff --git a/test/stderr/0002 b/test/stderr/0002 index 68d246ecd..329b4a2be 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -183,7 +183,7 @@ file lookup required for ten-1.test.ex lookup yielded: host in "partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch"? yes (matched "partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch") deny: condition test succeeded -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT H=ten-1.test.ex [V4NET.0.0.1] rejected connection in "connect" ACL search_tidyup called @@ -227,7 +227,7 @@ lookup failed host in "net-lsearch;TESTSUITE/aux-fixed/0002.lsearch"? no (end of list) deny: condition test failed end of ACL "connect2": implicit DENY -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT H=[V4NET.0.0.2] rejected connection in "connect" ACL search_tidyup called diff --git a/test/stderr/0022 b/test/stderr/0022 index dbda13f9c..deab48a24 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -20,19 +20,19 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "warn_empty" processing "warn" warn: condition test succeeded processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called host in ignore_fromline_hosts? no (option unset) >>Headers received: @@ -51,10 +51,10 @@ calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN <= x@y H=[V4NET.9.8.7] P=smtp S=sss -SMTP>> 250 OK id=10HmbF-0005vi-00 +SMTP>> 250 OK id=10HmbF-0005vi-00 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT search_tidyup called @@ -81,10 +81,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "warn_log" processing "warn" @@ -93,9 +93,9 @@ LOG: MAIN H=[V4NET.9.8.7] Warning: warn log message processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called host in ignore_fromline_hosts? no (option unset) >>Headers received: @@ -114,10 +114,10 @@ calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN <= x@y H=[V4NET.9.8.7] P=smtp S=sss -SMTP>> 250 OK id=10HmbG-0005vi-00 +SMTP>> 250 OK id=10HmbG-0005vi-00 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT search_tidyup called @@ -144,19 +144,19 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "warn_user" processing "warn" warn: condition test succeeded processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called host in ignore_fromline_hosts? no (option unset) >>Headers received: @@ -178,10 +178,10 @@ calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN <= x@y H=[V4NET.9.8.7] P=smtp S=sss -SMTP>> 250 OK id=10HmbH-0005vi-00 +SMTP>> 250 OK id=10HmbH-0005vi-00 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT search_tidyup called diff --git a/test/stderr/0094 b/test/stderr/0094 index 5e99df76f..0e16e5f1a 100644 --- a/test/stderr/0094 +++ b/test/stderr/0094 @@ -106,10 +106,10 @@ 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) -SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "check_recipient" processing "accept" @@ -121,7 +121,7 @@ check domains = +local_domains test.ex in "test.ex"? yes (matched "test.ex") test.ex in "+local_domains"? yes (matched "+local_domains") accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: using ACL "check_recipient" processing "accept" @@ -140,11 +140,11 @@ host in "+relay_hosts"? no (end of list) accept: condition test failed processing "deny" deny: condition test succeeded -SMTP>> 550 relay not permitted +SMTP>> 550 relay not permitted LOG: MAIN REJECT H=oneback.test.ex [V4NET.99.99.90] F= rejected RCPT : relay not permitted SMTP<< quit -SMTP>> 221 the.local.host.name closing connection +SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN SMTP connection from oneback.test.ex [V4NET.99.99.90] closed by QUIT search_tidyup called diff --git a/test/stderr/0277 b/test/stderr/0277 index cacbd7305..e92ac09f1 100644 --- a/test/stderr/0277 +++ b/test/stderr/0277 @@ -30,10 +30,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.2.3.4] closed by QUIT search_tidyup called @@ -65,10 +65,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.6.7.8] closed by QUIT search_tidyup called @@ -108,10 +108,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.10.11.12] closed by QUIT search_tidyup called @@ -151,10 +151,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.1.1.1] closed by QUIT search_tidyup called @@ -193,10 +193,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.2.2.2] closed by QUIT search_tidyup called diff --git a/test/stderr/0294 b/test/stderr/0294 index 5afdb770a..184cf9f41 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -6,26 +6,26 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL LOG: smtp_connection MAIN SMTP connection from CALLER -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: rate limit RCPT: delay 0.25 sec -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: rate limit RCPT: delay 0.263 sec -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: rate limit RCPT: delay 0.276 sec -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: rate limit RCPT: delay 0.289 sec -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: @@ -45,15 +45,15 @@ Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-smtp S=sss created log directory TESTSUITE/spool/log -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-0005vi-00 smtp_setup_msg entered SMTP<< mail from: rate limit MAIL: delay 1 sec -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: @@ -73,13 +73,13 @@ Writing spool header file Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-smtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-0005vi-00 smtp_setup_msg entered SMTP<< mail from: rate limit MAIL: delay 2 sec -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -99,10 +99,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: processing "deny" check local_parts = reject @@ -110,7 +110,7 @@ one in "reject"? no (end of list) deny: condition test failed processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: host in smtp_ratelimit_hosts? no (end of list) processing "deny" @@ -119,9 +119,9 @@ one in "reject"? no (end of list) deny: condition test failed processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [1.2.3.4] closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -141,10 +141,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: processing "deny" check local_parts = reject @@ -152,7 +152,7 @@ one in "reject"? no (end of list) deny: condition test failed processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7") rate limit RCPT: delay 0.25 sec @@ -162,9 +162,9 @@ one in "reject"? no (end of list) deny: condition test failed processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -176,50 +176,50 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL LOG: smtp_connection MAIN SMTP connection from CALLER -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rcpt to: rate limit RCPT: delay 0.25 sec -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rcpt to: rate limit RCPT: delay 0.263 sec -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rcpt to: rate limit RCPT: delay 0.276 sec -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rcpt to: rate limit RCPT: delay 0.289 sec -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rset -SMTP>> 250 Reset OK +SMTP>> 250 Reset OK SMTP<< mail from: rate limit MAIL: delay 1 sec -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rset -SMTP>> 250 Reset OK +SMTP>> 250 Reset OK SMTP<< mail from: rate limit MAIL: delay 2 sec -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0303 b/test/stderr/0303 index 03325c5e3..f017d84ec 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -63,7 +63,7 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< EHLO [V4NET.2.3.4] [V4NET.2.3.4] in helo_lookup_domains? no (end of list) @@ -71,18 +71,18 @@ 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] host in pipelining_advertise_hosts? yes (matched "*") -SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4] -250-SIZE 52428800 -250-PIPELINING -250 HELP +SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4] +250-SIZE 52428800 +250-PIPELINING +250 HELP SMTP<< mail from:<> -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called >>Headers received: @@ -99,10 +99,10 @@ calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN <= <> H=([V4NET.2.3.4]) [V4NET.2.3.4] P=esmtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-0005vi-00 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from ([V4NET.2.3.4]) [V4NET.2.3.4] closed by QUIT search_tidyup called @@ -130,25 +130,25 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered 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] host in pipelining_advertise_hosts? yes (matched "*") -SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4] -250-SIZE 52428800 -250-PIPELINING -250 HELP +SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4] +250-SIZE 52428800 +250-PIPELINING +250 HELP SMTP<< mail from:<> -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called >>Headers received: @@ -165,10 +165,10 @@ calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN <= <> H=host.name.tld [V4NET.2.3.4] P=esmtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-0005vi-00 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from host.name.tld [V4NET.2.3.4] closed by QUIT search_tidyup called diff --git a/test/stderr/0362 b/test/stderr/0362 index 11f4826ce..ff1b2acd4 100644 --- a/test/stderr/0362 +++ b/test/stderr/0362 @@ -20,10 +20,10 @@ 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) -SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "check_rcpt" processing "accept" @@ -71,9 +71,9 @@ routed by r2 router transport: t2 ----------- end verify ------------ accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< quit -SMTP>> 221 the.local.host.name closing connection +SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.0.0.0] closed by QUIT search_tidyup called diff --git a/test/stderr/0371 b/test/stderr/0371 index 8b212f784..8b9b8ef0b 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -27,7 +27,7 @@ check set acl_c0 = $acl_c0; connect check set acl_c9 = $acl_c9; connect = ; connect accept: condition test succeeded -SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< ehlo something something in helo_lookup_domains? no (end of list) @@ -35,10 +35,10 @@ 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] host in pipelining_advertise_hosts? yes (matched "*") -SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0] -250-SIZE 52428800 -250-PIPELINING -250 HELP +SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0] +250-SIZE 52428800 +250-PIPELINING +250 HELP SMTP<< mail from: using ACL "mail" processing "accept" @@ -49,7 +49,7 @@ check set acl_c9 = $acl_c9; mail check set acl_m0 = $acl_m0; mail = ; mail accept: condition test succeeded -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "rcpt" processing "accept" @@ -60,9 +60,9 @@ check set acl_m9 = $acl_m9; rcpt check set acl_c0 = $acl_c0; rcpt = ; connect; mail; rcpt accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called >>Headers received: @@ -87,7 +87,7 @@ calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-0005vi-00 smtp_setup_msg entered SMTP<< vrfy x@y host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -109,7 +109,7 @@ routing x@y no more routers LOG: MAIN VRFY failed for x@y H=(something) [V4NET.0.0.0] -SMTP>> 550 Unrouteable address +SMTP>> 550 Unrouteable address SMTP<< mail from: using ACL "mail" processing "accept" @@ -120,9 +120,9 @@ check set acl_c9 = $acl_c9; mail check set acl_m0 = $acl_m0; mail = ; mail accept: condition test succeeded -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< quit -SMTP>> 221 mail.test.ex closing connection +SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (something) [V4NET.0.0.0] closed by QUIT search_tidyup called diff --git a/test/stderr/0381 b/test/stderr/0381 index 270b7b2ae..61e236edf 100644 --- a/test/stderr/0381 +++ b/test/stderr/0381 @@ -22,10 +22,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "check_rcpt" processing "warn" @@ -70,9 +70,9 @@ host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex") warn: condition test failed processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called diff --git a/test/stderr/0386 b/test/stderr/0386 index 3b9c6d950..89e64a9e0 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -22,10 +22,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to:<1@b> read ACL from file TESTSUITE/aux-fixed/0386.acl1 processing "accept" @@ -62,13 +62,13 @@ sender x@y verified ok require: condition test succeeded processing "deny" deny: condition test succeeded -SMTP>> 550 No such user here +SMTP>> 550 No such user here LOG: MAIN REJECT H=[V4NET.9.8.7] F= rejected RCPT <1@b>: No such user here SMTP<< rset -SMTP>> 250 Reset OK +SMTP>> 250 Reset OK SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to:<1@b> using ACL "TESTSUITE/aux-fixed/0386.acl1" processing "accept" @@ -104,11 +104,11 @@ sender x@y verified ok require: condition test succeeded processing "deny" deny: condition test succeeded -SMTP>> 550 No such user here +SMTP>> 550 No such user here LOG: MAIN REJECT H=[V4NET.9.8.7] F= rejected RCPT <1@b>: No such user here SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT search_tidyup called @@ -138,10 +138,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to:<2@b> read ACL from file TESTSUITE/aux-fixed/0386.acl2 processing "warn" @@ -160,9 +160,9 @@ LOG: MAIN created log directory TESTSUITE/spool/log processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called host in ignore_fromline_hosts? no (option unset) >>Headers received: @@ -187,7 +187,7 @@ Writing spool header file Size of headers = sss LOG: MAIN <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-0005vi-00 search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... @@ -299,9 +299,9 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> smtp_setup_msg entered SMTP<< rset -SMTP>> 250 Reset OK +SMTP>> 250 Reset OK SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to:<2@b> using ACL "TESTSUITE/aux-fixed/0386.acl2" processing "warn" @@ -315,9 +315,9 @@ LOG: MAIN H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called host in ignore_fromline_hosts? no (option unset) >>Headers received: @@ -342,7 +342,7 @@ Writing spool header file Size of headers = sss LOG: MAIN <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-0005vi-00 search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00 Exim version x.yz .... @@ -453,7 +453,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called diff --git a/test/stderr/0391 b/test/stderr/0391 index 9ef829074..1a22dfddf 100644 --- a/test/stderr/0391 +++ b/test/stderr/0391 @@ -20,10 +20,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "acl_rcpt" processing "accept" @@ -55,9 +55,9 @@ routed by r1 router ----------- end verify ------------ sender U@W.x.y verified ok as U@x.y accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [1.2.3.4] closed by QUIT search_tidyup called diff --git a/test/stderr/0396 b/test/stderr/0396 index 072e3d497..36700ad73 100644 --- a/test/stderr/0396 +++ b/test/stderr/0396 @@ -11,10 +11,10 @@ set_process_info: pppp accepting a local SMTP message from > 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: processing "accept" check domains = +fail @@ -22,12 +22,12 @@ expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list y in "+fail"? no (end of list) accept: condition test failed end of inline ACL: implicit DENY -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT created log directory TESTSUITE/spool/log SMTP<< quit -SMTP>> 221 the.local.host.name closing connection +SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called diff --git a/test/stderr/0398 b/test/stderr/0398 index e661fcb6c..6ed0f82e7 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -11,10 +11,10 @@ set_process_info: pppp accepting a local SMTP message from in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "rcpt" processing "deny" @@ -151,7 +151,7 @@ address match: subject=qq@remote pattern=qq@remote remote in "remote"? yes (matched "remote") qq@remote in "qq@remote"? yes (matched "qq@remote") accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: using ACL "rcpt" processing "deny" @@ -228,9 +228,9 @@ address match: subject=qq@remote pattern=qq@remote remote in "remote"? yes (matched "remote") qq@remote in "qq@remote"? yes (matched "qq@remote") accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< quit -SMTP>> 221 mail.test.ex closing connection +SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called diff --git a/test/stderr/0420 b/test/stderr/0420 index fc24272de..6694987ce 100644 --- a/test/stderr/0420 +++ b/test/stderr/0420 @@ -20,16 +20,16 @@ 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) -SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called host in ignore_fromline_hosts? no (option unset) >>Headers received: @@ -44,16 +44,16 @@ calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN <= x@y H=[V4NET.0.0.0] P=smtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-0005vi-00 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called host in ignore_fromline_hosts? no (option unset) >>Headers received: @@ -68,10 +68,10 @@ calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN <= a@b H=[V4NET.0.0.0] P=smtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-0005vi-00 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 mail.test.ex closing connection +SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.0.0.0] closed by QUIT search_tidyup called diff --git a/test/stderr/0432 b/test/stderr/0432 index 073340a0d..f4aa77a5a 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -45,7 +45,7 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: using ACL "mail" @@ -109,9 +109,9 @@ wrote positive callout cache address record ----------- end verify ------------ sender x@y verified ok accept: condition test succeeded -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [1.2.3.4] closed by QUIT search_tidyup called @@ -138,7 +138,7 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: using ACL "mail" @@ -183,9 +183,9 @@ callout cache: address record is positive ----------- end verify ------------ sender x@y verified ok accept: condition test succeeded -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [1.2.3.4] closed by QUIT search_tidyup called diff --git a/test/stderr/0435 b/test/stderr/0435 index d76e9aa8d..5c1c228fc 100644 --- a/test/stderr/0435 +++ b/test/stderr/0435 @@ -11,14 +11,14 @@ set_process_info: pppp accepting a local SMTP message from > 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< HELO ? LOG: smtp_syntax_error MAIN SMTP syntax error in "HELO ?" U=CALLER NULL character(s) present (shown as '?') -SMTP>> 501 NULL characters are not allowed in SMTP commands +SMTP>> 501 NULL characters are not allowed in SMTP commands SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called diff --git a/test/stderr/0464 b/test/stderr/0464 index c8df6e5da..67645cde0 100644 --- a/test/stderr/0464 +++ b/test/stderr/0464 @@ -11,10 +11,10 @@ set_process_info: pppp accepting a local SMTP message from > 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<> -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "rcpt" processing "require" @@ -163,9 +163,9 @@ routed by r2 router require: condition test succeeded processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called diff --git a/test/stderr/0465 b/test/stderr/0465 index 06a8a814b..cfa58eb8e 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -11,16 +11,16 @@ sender address = NULL in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<> -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: LOG: smtp_syntax_error MAIN SMTP syntax error in "rcpt to:" U=CALLER domain missing or malformed -SMTP>> 501 : domain missing or malformed +SMTP>> 501 : domain missing or malformed SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called @@ -39,16 +39,16 @@ sender address = NULL in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<> -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called >>Headers received: To: abc@domain. @@ -77,10 +77,10 @@ Size of headers = sss LOG: MAIN <= <> U=CALLER P=local-smtp S=sss created log directory TESTSUITE/spool/log -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-0005vi-00 smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called @@ -98,16 +98,16 @@ sender address = NULL in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<> -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called >>Headers received: To: abc@xyz. @@ -130,12 +130,12 @@ processing "accept" check verify = header_syntax accept: condition test failed end of ACL "check_data": implicit DENY -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz. smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called diff --git a/test/stderr/0479 b/test/stderr/0479 index 3a6e0b511..187aaf6c8 100644 --- a/test/stderr/0479 +++ b/test/stderr/0479 @@ -20,16 +20,16 @@ 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) -SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo [1.2.3.4] [1.2.3.4] in helo_lookup_domains? no (end of list) 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] -SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4] +SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4] SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "rcpt" processing "require" @@ -67,7 +67,7 @@ sender a@b verified ok as rewritten-a@rewritten-b require: condition test succeeded processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: using ACL "rcpt" processing "require" @@ -80,9 +80,9 @@ using cached sender verify result require: condition test succeeded processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< quit -SMTP>> 221 the.local.host.name closing connection +SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT search_tidyup called diff --git a/test/stderr/0487 b/test/stderr/0487 index f380ec1d3..07628551a 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -12,22 +12,22 @@ sender address = NULL in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +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 in pipelining_advertise_hosts? yes (matched "*") -SMTP>> 250-myhost.test.ex Hello CALLER at x.y -250-SIZE 52428800 -250-PIPELINING -250 HELP +SMTP>> 250-myhost.test.ex Hello CALLER at x.y +250-SIZE 52428800 +250-PIPELINING +250 HELP SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: processing "accept" accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called >>Headers received: From: unqualified @@ -54,7 +54,7 @@ Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-esmtp S=sss created log directory TESTSUITE/spool/log -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-0005vi-00 search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... @@ -166,7 +166,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called diff --git a/test/stderr/2600 b/test/stderr/2600 index 58371eb8b..9ba7bc19d 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -126,10 +126,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "check_recipient" processing "accept" @@ -154,7 +154,7 @@ host in "+relay_hosts"? no (end of list) accept: condition test failed processing "deny" deny: condition test succeeded -SMTP>> 550 relay not permitted +SMTP>> 550 relay not permitted LOG: MAIN REJECT H=[10.0.0.0] F= rejected RCPT : relay not permitted SMTP<< rcpt to: @@ -182,11 +182,11 @@ host in "+relay_hosts"? no (end of list) accept: condition test failed processing "deny" deny: condition test succeeded -SMTP>> 550 relay not permitted +SMTP>> 550 relay not permitted LOG: MAIN REJECT H=[10.0.0.0] F= rejected RCPT : relay not permitted SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [10.0.0.0] closed by QUIT search_tidyup called @@ -213,10 +213,10 @@ 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +SMTP>> 250 OK SMTP<< rcpt to: using ACL "check_recipient" processing "accept" @@ -238,7 +238,7 @@ lookup yielded: name=ok id=10.10.10.10 host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'") host in "+relay_hosts"? yes (matched "+relay_hosts") accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: using ACL "check_recipient" processing "accept" @@ -261,9 +261,9 @@ lookup yielded: name=ok id=10.10.10.10 host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'") host in "+relay_hosts"? yes (matched "+relay_hosts") accept: condition test succeeded -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [10.10.10.10] closed by QUIT search_tidyup called diff --git a/test/stderr/3201 b/test/stderr/3201 index 0c69a1218..47318b3ae 100644 --- a/test/stderr/3201 +++ b/test/stderr/3201 @@ -35,7 +35,7 @@ lookup failed host in "testdb;fail"? no (end of list) deny: condition test failed end of ACL "connect1": implicit DENY -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT H=[10.0.0.1] rejected connection in "connect" ACL search_tidyup called @@ -77,7 +77,7 @@ lookup failed host in "net-testdb;fail"? no (end of list) deny: condition test failed end of ACL "connect2": implicit DENY -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT H=[10.0.0.2] rejected connection in "connect" ACL search_tidyup called diff --git a/test/stderr/3400 b/test/stderr/3400 index 573d3afee..96b099052 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -383,7 +383,7 @@ host in "10.0.0.6"? no (end of list) warn: condition test failed processing "accept" accept: condition test succeeded -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< ehlo testing.testing testing.testing in helo_lookup_domains? no (end of list) @@ -395,22 +395,22 @@ host in "10.0.0.1"? no (end of list) host in "10.0.0.4"? no (end of list) host in "10.0.0.3 : 10.0.0.4"? no (end of list) host in auth_advertise_hosts? yes (matched "10.0.0.5") -SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5] -250-SIZE 52428800 -250-ETRN -250-EXPN -250-PIPELINING -250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250 HELP +SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5] +250-SIZE 52428800 +250-ETRN +250-EXPN +250-PIPELINING +250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250 HELP SMTP<< auth mylogin dXNlcnggc2VjcmV0 mylogin authenticator: $auth1 = userx secret $1 = userx secret +++MYLOGIN $1="userx secret" $2="" $3="" expanded string: yes -SMTP>> 235 Authentication succeeded +SMTP>> 235 Authentication succeeded SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called -- 2.30.2