summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/src/verify.c1
-rw-r--r--test/stderr/00211
-rw-r--r--test/stderr/02781
-rw-r--r--test/stderr/03611
-rw-r--r--test/stderr/03862
-rw-r--r--test/stderr/03881
-rw-r--r--test/stderr/04021
-rw-r--r--test/stderr/04031
-rw-r--r--test/stderr/04042
-rw-r--r--test/stderr/04081
-rw-r--r--test/stderr/04871
-rw-r--r--test/stderr/26001
-rw-r--r--test/stderr/45201
-rw-r--r--test/stderr/50041
-rw-r--r--test/stderr/50054
-rw-r--r--test/stderr/50061
16 files changed, 1 insertions, 20 deletions
diff --git a/src/src/verify.c b/src/src/verify.c
index e46d2020b..706d42a0f 100644
--- 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 ce72feb75..7c5a79ee9 100644
--- 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 0274527ee..2d9967293 100644
--- 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 d90d472d6..2506e1cfb 100644
--- 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 0b980acda..44e856da2 100644
--- 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 df772c330..92b3f23e1 100644
--- 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 ea99dea2c..a007de31c 100644
--- 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 32387a9fc..716cabdf2 100644
--- 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 96c42cb7a..d3d8f4c64 100644
--- 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 e71299fea..f3d6d6b1a 100644
--- 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 c29883a0f..7319b67dd 100644
--- 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 957092f7f..4e9974733 100644
--- 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 1642af78b..c2a856bb1 100644
--- 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 62a0ef987..ad5c9b331 100644
--- 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 74f66486e..8b28b7055 100644
--- 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 4211a1877..dce0d0050 100644
--- 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