diff options
Diffstat (limited to 'contrib/sendmail/src/savemail.c')
-rw-r--r-- | contrib/sendmail/src/savemail.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index 6a18ee6..53e1a51 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)savemail.c 8.140 (Berkeley) 1/18/1999"; +static char sccsid[] = "@(#)savemail.c 8.139 (Berkeley) 8/5/1998"; #endif /* not lint */ # include "sendmail.h" @@ -395,7 +395,7 @@ savemail(e, sendbody) mcibuf.mci_contentlen = 0; putfromline(&mcibuf, e); - (*e->e_puthdr)(&mcibuf, e->e_header, e, M87F_OUTER); + (*e->e_puthdr)(&mcibuf, e->e_header, e); (*e->e_putbody)(&mcibuf, e, NULL); putline("\n", &mcibuf); (void) fflush(fp); @@ -550,7 +550,7 @@ returntosender(msg, returnq, flags, e) addheader("MIME-Version", "1.0", &ee->e_header); (void) snprintf(buf, sizeof buf, "%s.%ld/%.100s", - ee->e_id, curtime(), MyHostName); + ee->e_id, (long)curtime(), MyHostName); ee->e_msgboundary = newstr(buf); (void) snprintf(buf, sizeof buf, #if DSN @@ -587,14 +587,14 @@ returntosender(msg, returnq, flags, e) else if (bitset(RTSF_PM_BOUNCE, flags)) { snprintf(buf, sizeof buf, "Postmaster notify: %.*s", - sizeof buf - 20, msg); + (int)sizeof buf - 20, msg); addheader("Subject", buf, &ee->e_header); p = "postmaster-notification"; } else { snprintf(buf, sizeof buf, "Returned mail: %.*s", - sizeof buf - 20, msg); + (int)sizeof buf - 20, msg); addheader("Subject", buf, &ee->e_header); p = "failure"; } @@ -1139,7 +1139,7 @@ errbody(mci, e, separator) } } putline("", mci); - putheader(mci, e->e_parent->e_header, e->e_parent, M87F_OUTER); + putheader(mci, e->e_parent->e_header, e->e_parent); if (sendbody) putbody(mci, e->e_parent, e->e_msgboundary); else if (e->e_msgboundary == NULL) |