diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2006-06-14 16:25:31 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2006-06-14 16:25:31 +0000 |
commit | 18e97b419daa5793c57a596eed732ef8b2724142 (patch) | |
tree | b8e496d8c89facb0789d723771fd182fa46f726e /contrib/sendmail/src/headers.c | |
parent | 9263e5eeaacae1b6448efe5929386998cbdf4b48 (diff) | |
download | FreeBSD-src-18e97b419daa5793c57a596eed732ef8b2724142.zip FreeBSD-src-18e97b419daa5793c57a596eed732ef8b2724142.tar.gz |
Resolve conflicts from sendmail 8.13.7 import
Diffstat (limited to 'contrib/sendmail/src/headers.c')
-rw-r--r-- | contrib/sendmail/src/headers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index 0bd0c49..383a053 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -14,7 +14,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: headers.c,v 8.290 2006/02/25 02:16:52 ca Exp $") +SM_RCSID("@(#)$Id: headers.c,v 8.291 2006/03/24 01:01:56 ca Exp $") static HDR *allocheader __P((char *, char *, int, SM_RPOOL_T *)); static size_t fix_mime_header __P((HDR *, ENVELOPE *)); @@ -1543,7 +1543,7 @@ crackaddr(addr, e) ** flags -- MIME conversion flags. ** ** Returns: -** success +** true iff header part was written successfully ** ** Side Effects: ** none. @@ -1811,7 +1811,7 @@ putheader(mci, hdr, e, flags) ** mci -- the connection info for output ** ** Returns: -** success +** true iff header was written successfully */ static bool @@ -1872,7 +1872,7 @@ put_vanilla_header(h, v, mci) ** e -- the envelope containing the message. ** ** Returns: -** success +** true iff header field was written successfully ** ** Side Effects: ** outputs "p" to file "fp". |