diff options
Diffstat (limited to 'contrib/sendmail/src')
| -rw-r--r-- | contrib/sendmail/src/conf.c | 5 | ||||
| -rw-r--r-- | contrib/sendmail/src/conf.h | 3 | ||||
| -rw-r--r-- | contrib/sendmail/src/headers.c | 9 | ||||
| -rw-r--r-- | contrib/sendmail/src/mci.c | 11 | ||||
| -rw-r--r-- | contrib/sendmail/src/savemail.c | 12 | ||||
| -rw-r--r-- | contrib/sendmail/src/sendmail.8 | 7 |
6 files changed, 24 insertions, 23 deletions
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index 1cf447d..573cd1d 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -9,11 +9,12 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ */ #include <sendmail.h> -SM_RCSID("@(#)$Id: conf.c,v 8.1082 2006/03/22 22:49:33 ca Exp $") +SM_RCSID("@(#)$Id: conf.c,v 8.1081 2006/02/24 02:21:53 ca Exp $") #include <sendmail/pathnames.h> #if NEWDB @@ -2197,7 +2198,7 @@ shouldqueue(pri, ct) memfree < QueueLowMem) { if (tTd(3, 30)) - sm_dprintf("true (memfree=%ld < QueueLowMem=%ld)\n", + sm_dprintf("true (memfree=%ld < QueueLowMem)\n", memfree, QueueLowMem); return true; } diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index 5e85015..ab23bca 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -11,6 +11,9 @@ * * * $Id: conf.h,v 8.570 2005/12/09 18:37:27 ca Exp $ + * + * $FreeBSD$ + * */ /* diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index 8a142d2..0bd0c49 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -9,11 +9,12 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ */ #include <sendmail.h> -SM_RCSID("@(#)$Id: headers.c,v 8.291 2006/03/24 01:01:56 ca Exp $") +SM_RCSID("@(#)$Id: headers.c,v 8.290 2006/02/25 02:16:52 ca Exp $") static HDR *allocheader __P((char *, char *, int, SM_RPOOL_T *)); static size_t fix_mime_header __P((HDR *, ENVELOPE *)); @@ -1542,7 +1543,7 @@ crackaddr(addr, e) ** flags -- MIME conversion flags. ** ** Returns: -** true iff header part was written successfully +** success ** ** Side Effects: ** none. @@ -1810,7 +1811,7 @@ putheader(mci, hdr, e, flags) ** mci -- the connection info for output ** ** Returns: -** true iff header was written successfully +** success */ static bool @@ -1871,7 +1872,7 @@ put_vanilla_header(h, v, mci) ** e -- the envelope containing the message. ** ** Returns: -** true iff header field was written successfully +** success ** ** Side Effects: ** outputs "p" to file "fp". diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index 802ab00..dd07449 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -9,11 +9,12 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ */ #include <sendmail.h> -SM_RCSID("@(#)$Id: mci.c,v 8.217 2006/04/18 01:27:36 ca Exp $") +SM_RCSID("@(#)$Id: mci.c,v 8.216 2005/07/12 22:27:44 ca Exp $") #if NETINET || NETINET6 # include <arpa/inet.h> @@ -922,17 +923,9 @@ mci_read_persistent(fp, mci) char buf[MAXLINE]; if (fp == NULL) - { syserr("mci_read_persistent: NULL fp"); - /* NOTREACHED */ - return -1; - } if (mci == NULL) - { syserr("mci_read_persistent: NULL mci"); - /* NOTREACHED */ - return -1; - } if (tTd(56, 93)) { sm_dprintf("mci_read_persistent: fp=%lx, mci=", diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index e44f4c1..66141df 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2003, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -9,11 +9,13 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ #include <sendmail.h> -SM_RCSID("@(#)$Id: savemail.c,v 8.308 2006/04/18 01:31:33 ca Exp $") +SM_RCSID("@(#)$Id: savemail.c,v 8.306 2006/02/25 02:16:53 ca Exp $") static bool errbody __P((MCI *, ENVELOPE *, char *)); static bool pruneroute __P((char *)); @@ -733,7 +735,7 @@ returntosender(msg, returnq, flags, e) ** separator -- any possible MIME separator (unused). ** ** Returns: -** true iff body was written successfully +** success ** ** Side Effects: ** Outputs the body of an error message. @@ -1264,8 +1266,8 @@ errbody(mci, e, separator) /* Diagnostic-Code: -- actual result from other end */ if (q->q_rstatus != NULL) { - if (q->q_mailer == NULL || - (p = q->q_mailer->m_diagtype) == NULL) + p = q->q_mailer->m_diagtype; + if (p == NULL) p = "smtp"; (void) sm_snprintf(buf, sizeof buf, "Diagnostic-Code: %s; %.800s", diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8 index 2d0284a..65d37b0 100644 --- a/contrib/sendmail/src/sendmail.8 +++ b/contrib/sendmail/src/sendmail.8 @@ -724,13 +724,13 @@ collected statistics /var/spool/mqueue/* temp files .SH SEE ALSO -binmail(1), mail(1), -rmail(1), syslog(3), aliases(5), mailaddr(7), -rc(8) +mail.local(8), +rc(8), +rmail(8) .PP DARPA Internet Request For Comments @@ -746,3 +746,4 @@ The .B sendmail command appeared in 4.2BSD. +.\" $FreeBSD$ |
