diff options
Diffstat (limited to 'contrib/sendmail/src')
| -rw-r--r-- | contrib/sendmail/src/conf.c | 29 | ||||
| -rw-r--r-- | contrib/sendmail/src/headers.c | 5 | ||||
| -rw-r--r-- | contrib/sendmail/src/mci.c | 5 | ||||
| -rw-r--r-- | contrib/sendmail/src/savemail.c | 5 | ||||
| -rw-r--r-- | contrib/sendmail/src/sendmail.8 | 7 |
5 files changed, 19 insertions, 32 deletions
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index 66f80d6..c8989a0 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.1052 2004/12/15 22:45:55 ca Exp $") +SM_RCSID("@(#)$Id: conf.c,v 8.1047 2004/07/14 21:54:23 ca Exp $") #include <sendmail/pathnames.h> #if NEWDB @@ -35,12 +36,6 @@ static void setupmaps __P((void)); static void setupmailers __P((void)); static void setupqueues __P((void)); static int get_num_procs_online __P((void)); -static int add_hostnames __P((SOCKADDR *)); - -#if NETINET6 && NEEDSGETIPNODE -static struct hostent *getipnodebyname __P((char *, int, int, int *)); -static struct hostent *getipnodebyaddr __P((char *, int, int, int *)); -#endif /* NETINET6 && NEEDSGETIPNODE */ /* @@ -150,9 +145,6 @@ struct prival PrivacyValues[] = { "noreceipts", PRIV_NORECEIPTS }, { "nobodyreturn", PRIV_NOBODYRETN }, { "goaway", PRIV_GOAWAY }, -#if _FFR_PRIV_NOACTUALRECIPIENT - { "noactualrecipient", PRIV_NOACTUALRECIPIENT }, -#endif /* _FFR_PRIV_NOACTUALRECIPIENT */ { NULL, 0 } }; @@ -6031,6 +6023,10 @@ char *FFRCompileOptions[] = /* Allow local (not just TCP) socket connection to server. */ "_FFR_DAEMON_NETUNIX", #endif /* _FFR_DAEMON_NETUNIX */ +#if _FFR_DEAL_WITH_ERROR_SSL + /* Deal with SSL errors by recognizing them as EOF. */ + "_FFR_DEAL_WITH_ERROR_SSL", +#endif /* _FFR_DEAL_WITH_ERROR_SSL */ #if _FFR_DEPRECATE_MAILER_FLAG_I /* What it says :-) */ "_FFR_DEPRECATE_MAILER_FLAG_I", @@ -6135,7 +6131,7 @@ char *FFRCompileOptions[] = ** Gurusamy Sarathy of ActiveState */ - "_FFR_MAXDATASIZE", + "_FFR_MAXDATASIZE" #endif /* _FFR_MAXDATASIZE */ #if _FFR_MAX_FORWARD_ENTRIES /* Try to limit number of .forward entries */ @@ -6170,15 +6166,6 @@ char *FFRCompileOptions[] = /* Disable PIPELINING, delay client if used. */ "_FFR_NO_PIPE", #endif /* _FFR_NO_PIPE */ -#if _FFR_PRIV_NOACTUALRECIPIENT - /* - ** PrivacyOptions=noactualrecipient stops sendmail from putting - ** X-Actual-Recipient lines in DSNs revealing the actual - ** account that addresses map to. Patch from Dan Harkless. - */ - - "_FFR_PRIV_NOACTUALRECIPIENT" -#endif /* _FFR_PRIV_NOACTUALRECIPIENT */ #if _FFR_QUEUEDELAY /* Exponential queue delay; disabled in 8.13 since it isn't used. */ "_FFR_QUEUEDELAY", @@ -6227,7 +6214,7 @@ char *FFRCompileOptions[] = #endif /* _FFR_SHM_STATUS */ #if _FFR_SKIP_DOMAINS /* process every N'th domain instead of every N'th message */ - "_FFR_SKIP_DOMAINS", + "_FFR_SKIP_DOMAINS" #endif /* _FFR_SKIP_DOMAINS */ #if _FFR_SLEEP_USE_SELECT /* Use select(2) in libsm/clock.c to emulate sleep(2) */ diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index 892a2cf..59bbf56 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.287 2004/12/03 18:29:51 ca Exp $") +SM_RCSID("@(#)$Id: headers.c,v 8.286 2004/07/08 17:57:32 ca Exp $") static HDR *allocheader __P((char *, char *, int, SM_RPOOL_T *)); static size_t fix_mime_header __P((HDR *, ENVELOPE *)); @@ -1811,7 +1812,7 @@ put_vanilla_header(h, v, mci) register char *nlp; register char *obp; int putflags; - char obuf[MAXLINE + 256]; /* additional length for h_field */ + char obuf[MAXLINE]; putflags = PXLF_HEADER; if (bitnset(M_7BITHDRS, mci->mci_mailer->m_flags)) diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index 4955197..8cdd12f 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.212 2004/08/04 21:11:31 ca Exp $") +SM_RCSID("@(#)$Id: mci.c,v 8.211 2003/03/31 17:35:50 ca Exp $") #if NETINET || NETINET6 # include <arpa/inet.h> @@ -1045,7 +1046,7 @@ mci_store_persistent(mci) int mci_traverse_persistent(action, pathname) - int (*action)__P((char *, char *)); + int (*action)(); char *pathname; { struct stat statbuf; diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index 857d81f..231382a 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -13,7 +13,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: savemail.c,v 8.304 2004/10/06 21:36:06 ca Exp $") +SM_RCSID("@(#)$Id: savemail.c,v 8.303 2004/01/14 02:56:51 ca Exp $") static void errbody __P((MCI *, ENVELOPE *, char *)); static bool pruneroute __P((char *)); @@ -1182,9 +1182,6 @@ errbody(mci, e, separator) /* X-Actual-Recipient: -- the real problem address */ if (actual[0] != '\0' && q->q_finalrcpt != NULL && -#if _FFR_PRIV_NOACTUALRECIPIENT - !bitset(PRIV_NOACTUALRECIPIENT, PrivacyFlags) && -#endif /* _FFR_PRIV_NOACTUALRECIPIENT */ strcmp(actual, q->q_finalrcpt) != 0) { (void) sm_snprintf(buf, sizeof buf, 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$ |
