diff options
| author | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2007-11-05 00:04:21 +0000 |
|---|---|---|
| committer | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2007-11-05 00:04:21 +0000 |
| commit | ffb836234b94e17739bac88bfd7f51f5ae49e3bc (patch) | |
| tree | ae6d46e2ddda2d02221479b71fbe8a44dd728c34 /contrib/sendmail/src/deliver.c | |
| parent | dda9925afc30a1f00ae6120e18e3490acda4d19a (diff) | |
| download | src-ffb836234b94e17739bac88bfd7f51f5ae49e3bc.tar.gz src-ffb836234b94e17739bac88bfd7f51f5ae49e3bc.zip | |
Import sendmail 8.14.2vendor/sendmail/8.14.2
Notes
Notes:
svn path=/vendor/sendmail/dist/; revision=173340
svn path=/vendor/sendmail/8.14.2/; revision=173342; tag=vendor/sendmail/8.14.2
Diffstat (limited to 'contrib/sendmail/src/deliver.c')
| -rw-r--r-- | contrib/sendmail/src/deliver.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/sendmail/src/deliver.c b/contrib/sendmail/src/deliver.c index 01d5258071e7..ed60e47a3c96 100644 --- a/contrib/sendmail/src/deliver.c +++ b/contrib/sendmail/src/deliver.c @@ -14,7 +14,7 @@ #include <sendmail.h> #include <sm/time.h> -SM_RCSID("@(#)$Id: deliver.c,v 8.1012 2007/03/29 21:20:15 ca Exp $") +SM_RCSID("@(#)$Id: deliver.c,v 8.1015 2007/10/17 21:35:30 ca Exp $") #if HASSETUSERCONTEXT # include <login_cap.h> @@ -495,7 +495,7 @@ sendall(e, mode) time_t now; if (tTd(13, 29)) - sm_dprintf("No deliveries: auto-queuing\n"); + sm_dprintf("No deliveries: auto-queueing\n"); mode = SM_QUEUE; now = curtime(); @@ -3293,6 +3293,8 @@ do_transfer: ok = (*e->e_puthdr)(mci, e->e_header, e, M87F_OUTER); if (ok) ok = (*e->e_putbody)(mci, e, NULL); + if (ok && bitset(MCIF_INLONGLINE, mci->mci_flags)) + ok = putline("", mci); /* ** Ignore an I/O error that was caused by EPIPE. @@ -3404,6 +3406,7 @@ do_transfer: /* No recipients in list and no missing responses? */ if (tobuf[0] == '\0' # if PIPELINING + && bitset(MCIF_PIPELINED, mci->mci_flags) && mci->mci_nextaddr == NULL # endif /* PIPELINING */ ) |