diff options
| author | peter <peter@FreeBSD.org> | 1996-02-22 18:57:52 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-02-22 18:57:52 +0000 |
| commit | 53bd532d4bc4b744c8923d48617fe126df03ef2f (patch) | |
| tree | 80e76edddf942d0991187f7c7a0547258ddc2c42 /usr.sbin/sendmail | |
| parent | 9c30a5e26b1d00af5480de71545f43773a71d926 (diff) | |
| download | FreeBSD-src-53bd532d4bc4b744c8923d48617fe126df03ef2f.zip FreeBSD-src-53bd532d4bc4b744c8923d48617fe126df03ef2f.tar.gz | |
Merge 8.7.3->8.7.4 changes onto mainline.
Diffstat (limited to 'usr.sbin/sendmail')
| -rw-r--r-- | usr.sbin/sendmail/src/headers.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sendmail/src/util.c | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/usr.sbin/sendmail/src/headers.c b/usr.sbin/sendmail/src/headers.c index 9bad1f8..3d20635 100644 --- a/usr.sbin/sendmail/src/headers.c +++ b/usr.sbin/sendmail/src/headers.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)headers.c 8.82 (Berkeley) 10/28/95"; +static char sccsid[] = "@(#)headers.c 8.82.1.1 (Berkeley) 2/18/96"; #endif /* not lint */ # include <errno.h> @@ -1253,6 +1253,8 @@ vanilla: putline(obuf, mci); p = ++nlp; obp = obuf; + if (*p != ' ' && *p != '\t') + *obp++ = ' '; } sprintf(obp, "%.*s", sizeof obuf - (obp - obuf) - 1, p); putline(obuf, mci); @@ -1437,7 +1439,7 @@ commaize(h, p, oldstyle, mci, e) firstone = FALSE; *p = savechar; } - (void) strcpy(obp, "\n"); + *obp = '\0'; putline(obuf, mci); } /* diff --git a/usr.sbin/sendmail/src/util.c b/usr.sbin/sendmail/src/util.c index eac336e..25960ac 100644 --- a/usr.sbin/sendmail/src/util.c +++ b/usr.sbin/sendmail/src/util.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)util.c 8.84 (Berkeley) 11/18/95"; +static char sccsid[] = "@(#)util.c 8.84.1.1 (Berkeley) 2/18/96"; #endif /* not lint */ # include "sendmail.h" @@ -989,7 +989,14 @@ putxline(l, mci, pxflags) (void) putc(*l, mci->mci_out); fputs(mci->mci_mailer->m_eol, mci->mci_out); if (*l == '\n') - ++l; + { + if (*++l != ' ' && *l != '\t' && l[1] != '\0') + { + (void) putc(' ', mci->mci_out); + if (TrafficLogFile != NULL) + (void) putc(' ', TrafficLogFile); + } + } } while (l[0] != '\0'); } /* @@ -1993,7 +2000,6 @@ denlstring(s, strict, logattacks) for (p = bp; (p = strchr(p, '\n')) != NULL; ) *p++ = ' '; -/* #ifdef LOG if (logattacks) { @@ -2002,7 +2008,6 @@ denlstring(s, strict, logattacks) shortenstring(bp, 203)); } #endif -*/ return bp; } |
