talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If sendmail is collecting a message *not* via SMTP, then this patch will 

turn off the read data block timeouts.  This was inspired by the same fix
in sendmail-8.7, but the code in this area is somewhat different. (8.7
is much more sensible).  This will stop the infamous
"timeout waiting for input during message body read" on long running jobs,
eg: /etc/daily | mail root.
This commit is contained in:
Peter Wemm 1995-11-20 23:32:21 +00:00
parent 2d9cb0580d
commit d57885c30d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/sendmail/src/collect.c
View File

@ -73,6 +73,7 @@ collect(smtpmode, requeueflag, e)
{
register FILE *tf;
bool ignrdot = smtpmode ? FALSE : IgnrDot;
time_t dbto = smtpmode ? TimeOuts.to_datablock : 0;
char buf[MAXLINE], buf2[MAXLINE];
register char *workbuf, *freebuf;
bool inputerr = FALSE;
@ -103,13 +104,13 @@ collect(smtpmode, requeueflag, e)
message("354 Enter mail, end with \".\" on a line by itself");
/* set global timer to monitor progress */
sfgetset(TimeOuts.to_datablock);
sfgetset(dbto);
/*
** Try to read a UNIX-style From line
*/
if (sfgets(buf, MAXLINE, InChannel, TimeOuts.to_datablock,
if (sfgets(buf, MAXLINE, InChannel, dbto,
"initial message read") == NULL)
goto readerr;
fixcrlf(buf, FALSE);
@ -119,7 +120,7 @@ collect(smtpmode, requeueflag, e)
if (!flusheol(buf, InChannel))
goto readerr;
eatfrom(buf, e);
if (sfgets(buf, MAXLINE, InChannel, TimeOuts.to_datablock,
if (sfgets(buf, MAXLINE, InChannel, dbto,
"message header read") == NULL)
goto readerr;
fixcrlf(buf, FALSE);
@ -166,8 +167,7 @@ collect(smtpmode, requeueflag, e)
{
int clen;
if (sfgets(freebuf, MAXLINE, InChannel,
TimeOuts.to_datablock,
if (sfgets(freebuf, MAXLINE, InChannel, dbto,
"message header read") == NULL)
{
freebuf[0] = '\0';
@ -247,7 +247,7 @@ collect(smtpmode, requeueflag, e)
if (*workbuf == '\0')
{
/* throw away a blank line */
if (sfgets(buf, MAXLINE, InChannel, TimeOuts.to_datablock,
if (sfgets(buf, MAXLINE, InChannel, dbto,
"message separator read") == NULL)
goto readerr;
}
@ -283,7 +283,7 @@ collect(smtpmode, requeueflag, e)
fputs("\n", tf);
if (ferror(tf))
tferror(tf, e);
if (sfgets(buf, MAXLINE, InChannel, TimeOuts.to_datablock,
if (sfgets(buf, MAXLINE, InChannel, dbto,
"message body read") == NULL)
goto readerr;
}