diff options
| author | peter <peter@FreeBSD.org> | 1997-11-10 02:05:23 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-11-10 02:05:23 +0000 |
| commit | d0e38bcf4bd5e3927bc10ebd2568a0bd0bf227c0 (patch) | |
| tree | 0946e43f76ee6f777e1b536b53d34490bfd984d8 /usr.sbin/sendmail/src/util.c | |
| parent | 93ede594f272b8bef49a4e4bbcedce5c14eb31a9 (diff) | |
| download | FreeBSD-src-d0e38bcf4bd5e3927bc10ebd2568a0bd0bf227c0.zip FreeBSD-src-d0e38bcf4bd5e3927bc10ebd2568a0bd0bf227c0.tar.gz | |
Merge sendmail 8.8.8 changes onto mainline. (For all of CVS's warts, when
things like this turn out this easy (ie: it took 30 seconds), it's nice :-)
Diffstat (limited to 'usr.sbin/sendmail/src/util.c')
| -rw-r--r-- | usr.sbin/sendmail/src/util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/sendmail/src/util.c b/usr.sbin/sendmail/src/util.c index c655b62..c305a31 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.133 (Berkeley) 8/1/97"; +static char sccsid[] = "@(#)util.c 8.137 (Berkeley) 10/22/97"; #endif /* not lint */ # include "sendmail.h" @@ -520,6 +520,7 @@ putline(l, mci) ** pxflags -- flag bits: ** PXLF_MAPFROM -- map From_ to >From_. ** PXLF_STRIP8BIT -- strip 8th bit. +** PXLF_HEADER -- map bare newline in header to newline space. ** ** Returns: ** none @@ -626,7 +627,8 @@ putxline(l, len, mci, pxflags) fputs(mci->mci_mailer->m_eol, mci->mci_out); if (l < end && *l == '\n') { - if (*++l != ' ' && *l != '\t' && *l != '\0') + if (*++l != ' ' && *l != '\t' && *l != '\0' && + bitset(PXLF_HEADER, pxflags)) { (void) putc(' ', mci->mci_out); if (TrafficLogFile != NULL) @@ -1058,7 +1060,6 @@ checkfd012(where) { #if XDEBUG register int i; - struct stat stbuf; for (i = 0; i < 3; i++) fill_fd(i, where); @@ -1199,7 +1200,6 @@ dumpfd(fd, printclosed, logit) int i; struct stat st; char buf[200]; - extern char *hostnamebyanyaddr(); p = buf; snprintf(p, SPACELEFT(buf, p), "%3d: ", fd); @@ -1311,7 +1311,7 @@ defprint: printit: if (logit) - sm_syslog(LOG_DEBUG, CurEnv->e_id, + sm_syslog(LOG_DEBUG, CurEnv ? CurEnv->e_id : NULL, "%.800s", buf); else printf("%s\n", buf); |
