Re: Double "end data with"?

On Mon, 9 Feb 2004, Wietse Venema wrote:

> Ralf Hildebrandt:
> > In: RCPT TO:<whatever>
> > Out: 250 Ok
> > In: DATA
> > Out: 354 End data with <CR><LF>.<CR><LF>
> > Out: 354 End data with <CR><LF>.<CR><LF>
> > In: QUIT
> > Out: 221 Bye
>
> That should be:
>
> > In: RCPT TO:<whatever>
> > Out: 250 Ok
> > In: DATA
> > Out: 354 End data with <CR><LF>.<CR><LF>
> Out: 250 queued as [the queue ID here]
>
> If anyone has time to look for this, I can't reproduce this
> but it seems to happen with the real-time proxy.
>
> This may be a vstring/realloc/dangling pointer problem.
>

More benign I think. When the content filter closes the connection between
"DATA" and "." (or the connection times out). The "proxy_buffer" is not
reset from the initial "354 ..." response. The patch below might fix the
problem:

Index: src/smtpd/smtpd.c
--- src/smtpd/smtpd.c 5 Feb 2004 20:59:23 -0000 1.1.1.30.4.1
+++ src/smtpd/smtpd.c 10 Feb 2004 00:17:57 -0000
@@ -1486,6 +1486,9 @@
if (state->err == CLEANUP_STAT_OK &&
*STR(state->proxy_buffer) != '2')
state->err = CLEANUP_STAT_CONT;
+ } else {
+ vstring_sprintf(state->proxy_buffer,
+ "451 Error: queue file write error");
}
smtpd_proxy_close(state);
}

--
Viktor.