From 77723dedebf263a1abacc9d68d81d8c6c2484c5f Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 23 May 2022 14:15:15 +0100 Subject: Debug: clarify SMTP DATA ops in transport --- src/src/transports/smtp.c | 4 ++-- test/stderr/0143 | 2 +- test/stderr/0217 | 2 +- test/stderr/0218 | 6 +++--- test/stderr/0467 | 2 +- test/stderr/0525 | 2 +- test/stderr/0623 | 6 +++--- test/stderr/1150 | 6 +++--- test/stderr/1160 | 6 +++--- test/stderr/2035 | 2 +- test/stderr/2135 | 2 +- test/stderr/3404 | 6 +++--- test/stderr/4052 | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index d00f15fe1..e59055bd2 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -2563,7 +2563,7 @@ goto SEND_QUIT; if ( (sx->peer_offered & (OPTION_PIPE | OPTION_EARLY_PIPE)) == (OPTION_PIPE | OPTION_EARLY_PIPE)) { - DEBUG(D_transport) debug_printf("PIPE_CONNECT usable in future for this IP\n"); + DEBUG(D_transport) debug_printf("PIPECONNECT usable in future for this IP\n"); sx->ehlo_resp.cleartext_auths = study_ehlo_auths(sx); write_ehlo_cache_entry(sx); } @@ -3995,7 +3995,7 @@ else if (smtp_peer_options & OPTION_CHUNKING) debug_printf(" will write message using CHUNKING\n"); else - debug_printf(" SMTP>> writing message and terminating \".\"\n"); + debug_printf(" SMTP>> (writing message)\n"); transport_count = 0; #ifndef DISABLE_DKIM diff --git a/test/stderr/0143 b/test/stderr/0143 index a6ac4c949..f8c9624ce 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -40,7 +40,7 @@ sync_responses expect rcpt for userx@domain.com cmd buf flush ddd bytes sync_responses expect data SMTP<< 354 Send data - SMTP>> writing message and terminating "." + SMTP>> (writing message) cannot use sendfile for body: spoolfile not wireformat SMTP>> . writing data block fd=dddd size=sss timeout=300 diff --git a/test/stderr/0217 b/test/stderr/0217 index 30724222c..3885a352c 100644 --- a/test/stderr/0217 +++ b/test/stderr/0217 @@ -851,7 +851,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> DATA SMTP<< 351 Send more - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP<< 250 OK SMTP+> QUIT diff --git a/test/stderr/0218 b/test/stderr/0218 index acfb3c156..a048735a2 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -31,7 +31,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 Send more - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP<< 250 OK SMTP(close)>> @@ -55,7 +55,7 @@ T: send_to_server (ACL) SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 Send more - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP+> QUIT SMTP(shutdown)>> @@ -200,7 +200,7 @@ T: send_to_server (ACL) SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 OK - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP+> QUIT SMTP(shutdown)>> diff --git a/test/stderr/0467 b/test/stderr/0467 index 6c6ce3ede..463e4a70e 100644 --- a/test/stderr/0467 +++ b/test/stderr/0467 @@ -27,7 +27,7 @@ Connecting to localhost.test.ex [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> DATA SMTP<< 354 OK - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP<< 250 OK SMTP+> QUIT diff --git a/test/stderr/0525 b/test/stderr/0525 index cb4aae266..8ed331d62 100644 --- a/test/stderr/0525 +++ b/test/stderr/0525 @@ -13,7 +13,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> DATA SMTP<< 354 SEND - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP(close)>> cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354' LOG: MAIN diff --git a/test/stderr/0623 b/test/stderr/0623 index b98d9285c..08025cf85 100644 --- a/test/stderr/0623 +++ b/test/stderr/0623 @@ -36,7 +36,7 @@ sync_responses expect rcpt for tempreject@test.ex SMTP<< 250 OK rcpt sync_responses expect data SMTP<< 300 go ahead - SMTP>> writing message and terminating "." + SMTP>> (writing message) transport_check_waiting entered sequence=1 local_max=500 global_max=-1 no messages waiting for 127.0.0.1 @@ -102,7 +102,7 @@ sync_responses expect rcpt for permreject@test.ex SMTP<< 250 OK rcpt sync_responses expect data SMTP<< 300 go ahead - SMTP>> writing message and terminating "." + SMTP>> (writing message) transport_check_waiting entered sequence=1 local_max=500 global_max=-1 no messages waiting for 127.0.0.1 @@ -168,7 +168,7 @@ sync_responses expect rcpt for permreject@test.ex SMTP<< 250 OK rcpt sync_responses expect data SMTP<< 300 go ahead - SMTP>> writing message and terminating "." + SMTP>> (writing message) transport_check_waiting entered sequence=1 local_max=500 global_max=-1 no messages waiting for 127.0.0.1 diff --git a/test/stderr/1150 b/test/stderr/1150 index 7c53000c2..306deb614 100644 --- a/test/stderr/1150 +++ b/test/stderr/1150 @@ -24,7 +24,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP>> QUIT SMTP<< 250 OK id=10HmaZ-0005vi-00 @@ -61,7 +61,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 250 Accepted SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP>> QUIT SMTP<< 250 OK id=10HmbA-0005vi-00 @@ -95,7 +95,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP>> QUIT SMTP<< 250 OK id=10HmbB-0005vi-00 diff --git a/test/stderr/1160 b/test/stderr/1160 index a4fabf385..7e04db4d1 100644 --- a/test/stderr/1160 +++ b/test/stderr/1160 @@ -15,7 +15,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP>> QUIT SMTP<< 250 OK id=10HmaZ-0005vi-00 @@ -43,7 +43,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 250 Accepted SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP>> QUIT SMTP<< 250 OK id=10HmbA-0005vi-00 @@ -68,7 +68,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP>> QUIT SMTP<< 250 OK id=10HmbB-0005vi-00 diff --git a/test/stderr/2035 b/test/stderr/2035 index 308b3358d..4d6b49bb6 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -57,7 +57,7 @@ continued connection, proxied TLS cmd buf flush ddd bytes sync_responses expect data SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." + SMTP>> (writing message) cannot use sendfile for body: spoolfile not wireformat SMTP>> . writing data block fd=dddd size=sss timeout=300 diff --git a/test/stderr/2135 b/test/stderr/2135 index 308b3358d..4d6b49bb6 100644 --- a/test/stderr/2135 +++ b/test/stderr/2135 @@ -57,7 +57,7 @@ continued connection, proxied TLS cmd buf flush ddd bytes sync_responses expect data SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." + SMTP>> (writing message) cannot use sendfile for body: spoolfile not wireformat SMTP>> . writing data block fd=dddd size=sss timeout=300 diff --git a/test/stderr/3404 b/test/stderr/3404 index 17af167bc..ceb395949 100644 --- a/test/stderr/3404 +++ b/test/stderr/3404 @@ -15,7 +15,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 Recipient OK SMTP>> DATA SMTP<< 354 Send data - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP<< 250 OK SMTP+> QUIT @@ -44,7 +44,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 Recipient OK SMTP>> DATA SMTP<< 354 Send data - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP<< 250 OK SMTP+> QUIT @@ -77,7 +77,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 Recipient OK SMTP>> DATA SMTP<< 354 Send data - SMTP>> writing message and terminating "." + SMTP>> (writing message) SMTP>> . SMTP<< 250 OK SMTP+> QUIT diff --git a/test/stderr/4052 b/test/stderr/4052 index 72841ee1f..3c07e0e2c 100644 --- a/test/stderr/4052 +++ b/test/stderr/4052 @@ -47,7 +47,7 @@ sync_responses expect rcpt for extchange@test.ex SMTP<< 250 rcpt-to accepted sync_responses expect data SMTP<< 354 data go-ahead - SMTP>> writing message and terminating "." + SMTP>> (writing message) transport_check_waiting entered sequence=1 local_max=500 global_max=-1 no messages waiting for 127.0.0.1 -- cgit v1.2.1