summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2013-12-29 19:10:05 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2014-01-05 15:23:24 +0000
commitd6e96b36bd210fc2dbf8830202ff4daf0720ef1a (patch)
tree1edc16c891af8e7c42388e52439f284a8afe5182 /src
parentaa26e1378803587c24924ad0055318959d597802 (diff)
Explicitly disable cutthrough on transports having filters
Diffstat (limited to 'src')
-rw-r--r--src/src/verify.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/src/verify.c b/src/src/verify.c
index a09782bcd..911d67227 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -694,13 +694,15 @@ else
done = TRUE; /* so far so good; have response to HELO */
- /*XXX the EHLO response would be analyzed here for IGNOREQUOTA, SIZE, PIPELINING, AUTH */
- /* If we haven't authenticated, but are required to, give up. */
+ /*XXX the EHLO response would be analyzed here for IGNOREQUOTA, SIZE, PIPELINING */
- /*XXX "filter command specified for this transport" ??? */
- /* for now, transport_filter by cutthrough-delivery is not supported */
+ /* For now, transport_filter by cutthrough-delivery is not supported */
/* Need proper integration with the proper transport mechanism. */
-
+ if (cutthrough_delivery && addr->transport->filter_command)
+ {
+ cutthrough_delivery= FALSE;
+ HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of transport filter\n");
+ }
SEND_FAILED:
RESPONSE_FAILED:
@@ -722,6 +724,7 @@ else
}
}
+ /* If we haven't authenticated, but are required to, give up. */
/* Try to AUTH */
else done = smtp_auth(responsebuffer, sizeof(responsebuffer),