42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
diff --git a/src/receive.c b/src/receive.c
|
|
index 3246621..f19c8b9 100644
|
|
--- a/src/receive.c
|
|
+++ b/src/receive.c
|
|
@@ -1827,7 +1827,7 @@ for (;;)
|
|
prevent further reading), and break out of the loop, having freed the
|
|
empty header, and set next = NULL to indicate no data line. */
|
|
|
|
- if (ptr == 0 && ch == '.' && (smtp_input || dot_ends))
|
|
+ if (ptr == 0 && ch == '.' && dot_ends)
|
|
{
|
|
ch = (receive_getc)(GETC_BUFFER_UNLIMITED);
|
|
if (ch == '\r')
|
|
diff --git a/src/smtp_in.c b/src/smtp_in.c
|
|
index 1b45f84..0207540 100644
|
|
--- a/src/smtp_in.c
|
|
+++ b/src/smtp_in.c
|
|
@@ -4955,16 +4955,23 @@ while (done <= 0)
|
|
DEBUG(D_receive) debug_printf("chunking state %d, %d bytes\n",
|
|
(int)chunking_state, chunking_data_left);
|
|
|
|
+ /* push the current receive_* function on the "stack", and
|
|
+ replace them by bdat_getc(), which in turn will use the lwr_receive_*
|
|
+ functions to do the dirty work. */
|
|
lwr_receive_getc = receive_getc;
|
|
lwr_receive_ungetc = receive_ungetc;
|
|
+
|
|
receive_getc = bdat_getc;
|
|
receive_ungetc = bdat_ungetc;
|
|
|
|
+ dot_ends = FALSE;
|
|
+
|
|
goto DATA_BDAT;
|
|
}
|
|
|
|
case DATA_CMD:
|
|
HAD(SCH_DATA);
|
|
+ dot_ends = TRUE;
|
|
|
|
DATA_BDAT: /* Common code for DATA and BDAT */
|
|
if (!discarded && recipients_count <= 0)
|