diff options
Diffstat (limited to 'usr.sbin/sendmail/src/headers.c')
| -rw-r--r-- | usr.sbin/sendmail/src/headers.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/usr.sbin/sendmail/src/headers.c b/usr.sbin/sendmail/src/headers.c index 857e9c3..ac67f2c 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.115 (Berkeley) 10/22/97"; +static char sccsid[] = "@(#)headers.c 8.111 (Berkeley) 7/9/97"; #endif /* not lint */ # include <errno.h> @@ -119,7 +119,7 @@ chompheader(line, def, hdrp, e) { /* have some */ register char *q = strchr(p + 1, *p); - + if (q != NULL) { *q++ = '\0'; @@ -522,16 +522,9 @@ eatheader(e, full) (void) sendtolist(h->h_value, NULLADDR, &e->e_sendqueue, 0, e); -#if 0 - /* - ** Change functionality so a fatal error on an - ** address doesn't affect the entire envelope. - */ - /* delete fatal errors generated by this address */ - if (!bitset(EF_FATALERRS, saveflags)) + if (!GrabTo && !bitset(EF_FATALERRS, saveflags)) e->e_flags &= ~EF_FATALERRS; -#endif } /* save the message-id for logging */ @@ -1337,7 +1330,7 @@ put_vanilla_header(h, v, mci) int putflags; char obuf[MAXLINE]; - putflags = PXLF_HEADER; + putflags = 0; #if _FFR_7BITHDRS if (bitnset(M_7BITHDRS, mci->mci_mailer->m_flags)) putflags |= PXLF_STRIP8BIT; @@ -1349,8 +1342,8 @@ put_vanilla_header(h, v, mci) int l; l = nlp - v; - if (SPACELEFT(obuf, obp) - 1 < l) - l = SPACELEFT(obuf, obp) - 1; + if (sizeof obuf - (obp - obuf) < l) + l = sizeof obuf - (obp - obuf); snprintf(obp, SPACELEFT(obuf, obp), "%.*s", l, v); putxline(obuf, strlen(obuf), mci, putflags); @@ -1392,7 +1385,7 @@ commaize(h, p, oldstyle, mci, e) int opos; int omax; bool firstone = TRUE; - int putflags = PXLF_HEADER; + int putflags = 0; char obuf[MAXLINE + 3]; /* @@ -1498,7 +1491,6 @@ commaize(h, p, oldstyle, mci, e) *p = savechar; continue; } - name = denlstring(name, FALSE, TRUE); /* output the name with nice formatting */ opos += strlen(name); @@ -1560,6 +1552,6 @@ copyheader(header) header = header->h_link; } *tail = NULL; - + return ret; } |
