Tweak debug output

diff --git a/src/src/verify.c b/src/src/verify.c
index e46d2020bd76d006de3572225c2389df8103cfa1..706d42a0fc1cad3ba853b96aff86c1c563454585 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1395,6 +1395,7 @@ cutthrough.delivery = cutthrough.callout_hold_only = FALSE;
 void
 release_cutthrough_connection(const uschar * why)
 {
+if (cutthrough.fd < 0) return;
 HDEBUG(D_acl) debug_printf_indent("release cutthrough conn: %s\n", why);
 cutthrough.fd = -1;
 cutthrough.delivery = cutthrough.callout_hold_only = FALSE;

diff --git a/test/stderr/0021 b/test/stderr/0021
index ce72feb75aa33affff1540dc15ada6e34863620b..7c5a79ee947a6dabf98781813d13da29ec36fda0 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -183,7 +183,6 @@ end of ACL "rcpt": ACCEPT
 >>
 LOG: MAIN
   <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
-release cutthrough conn: msg passed for delivery
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user

diff --git a/test/stderr/0278 b/test/stderr/0278
index 0274527eead2bf8297b36eb64b854c83fc126e14..2d9967293358676070616ac2ad0f7e536dd74af0 100644 (file)
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -114,7 +114,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/0361 b/test/stderr/0361
index d90d472d6145409e4719672574c4a9cedc8c2d08..2506e1cfbf70182494f5cbbf218ea511034b81d2 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -56,7 +56,6 @@ Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -N -odi -Mc 10HmaY-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/0386 b/test/stderr/0386
index 0b980acdac7d46d5129c3317b476d9628dfbfe84..44e856da20ac6c5ec18f815c1f7ea3c37a5b703e 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -221,7 +221,6 @@ LOG: MAIN
   <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -403,7 +402,6 @@ LOG: MAIN
   <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
 SMTP>> 250 OK id=10HmaY-0005vi-00
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/0388 b/test/stderr/0388
index df772c3309f3e7eb76fea067369399f9a043424d..92b3f23e1e392e0d7b7c944f51310a1941f0f2fd 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -223,7 +223,6 @@ Size of headers = sss
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xebb95ced -odi -Mc 10HmaY-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/0402 b/test/stderr/0402
index ea99dea2c58e0215fc4276f243202bd5ecd15385..a007de31c68edc370f755f07b68de3e76ae6b6d0 100644 (file)
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -174,7 +174,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95dfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/0403 b/test/stderr/0403
index 32387a9fcfb2885540aa9269bd4bca44b6181d39..716cabdf2fa2bec0dd6830057e6c4fd09d585039 100644 (file)
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -47,7 +47,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -N -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/0404 b/test/stderr/0404
index 96c42cb7ab5a272d400775a5fa44a4710e0c325d..d3d8f4c64b24d0c3c7c664c13509865f2d940712 100644 (file)
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -147,7 +147,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -1525,7 +1524,6 @@ Size of headers = sss
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/0408 b/test/stderr/0408
index e71299feaa79c3de25d4d6b2f29fc8c34c2f3dd1..f3d6d6b1a7113817a148156a77e54cdb39358be8 100644 (file)
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -47,7 +47,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/0487 b/test/stderr/0487
index c29883a0fc6539978ca8f806f899739c664904fe..7319b67dd49dc4e51d27e1f5c6e19c8056a0a9df 100644 (file)
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -74,7 +74,6 @@ LOG: MAIN
 created log directory TESTSUITE/spool/log
 SMTP>> 250 OK id=10HmaX-0005vi-00
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/2600 b/test/stderr/2600
index 957092f7f840d830e06675e0db3557ad0be1afb4..4e997473330662d51bf7f0ac2667bd5fd84f6e34 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -335,7 +335,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/4520 b/test/stderr/4520
index 1642af78baf57a789b0b24c2809ef93af5ce1642..c2a856bb18b6b2134e201bf11b484f16c45da134 100644 (file)
--- a/test/stderr/4520
+++ b/test/stderr/4520
@@ -3,7 +3,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-release cutthrough conn: msg passed for delivery
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user

diff --git a/test/stderr/5004 b/test/stderr/5004
index 62a0ef987da0aacd1c8f52861948fa3e796b22f7..ad5c9b33154c0e2f906fa4108845635ff70d736a 100644 (file)
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -49,7 +49,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/5005 b/test/stderr/5005
index 74f66486e664738b1736063af84eacb312cdd5f3..8b28b70556f88cfa097c3f64d47e757ee0446e7f 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -47,7 +47,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -236,7 +235,6 @@ Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -426,7 +424,6 @@ Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaZ-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -625,7 +622,6 @@ Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmbA-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

diff --git a/test/stderr/5006 b/test/stderr/5006
index 4211a1877e86726ad7dc8708d0f70104bcded396..dce0d0050390785584e8738b3afd8f95ca04a782 100644 (file)
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -47,7 +47,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-release cutthrough conn: msg passed for delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective