diff options
Diffstat (limited to 'contrib/sendmail/src')
-rw-r--r-- | contrib/sendmail/src/conf.c | 45 | ||||
-rw-r--r-- | contrib/sendmail/src/headers.c | 1 | ||||
-rw-r--r-- | contrib/sendmail/src/mci.c | 5 | ||||
-rw-r--r-- | contrib/sendmail/src/sendmail.8 | 7 |
4 files changed, 18 insertions, 40 deletions
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index 4d7aa94..654f52e 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2004 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,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.1061 2005/03/07 17:18:44 ca Exp $") +SM_RCSID("@(#)$Id: conf.c,v 8.1052 2004/12/15 22:45:55 ca Exp $") #include <sendmail/pathnames.h> #if NEWDB @@ -1431,7 +1432,6 @@ init_vendor_macros(e) #define LA_DEVSHORT 13 /* read short from a device */ #define LA_ALPHAOSF 14 /* Digital UNIX (OSF/1 on Alpha) table() call */ #define LA_PSET 15 /* Solaris per-processor-set load average */ -#define LA_LONGLONG 17 /* read kmem for avenrun; interpret as long long */ /* do guesses based on general OS type */ #ifndef LA_TYPE @@ -1470,7 +1470,7 @@ init_vendor_macros(e) # define _PATH_KMEM "/dev/kmem" #endif /* ! _PATH_KMEM */ -#if (LA_TYPE == LA_INT) || (LA_TYPE == LA_FLOAT) || (LA_TYPE == LA_SHORT) || (LA_TYPE == LA_LONGLONG) +#if (LA_TYPE == LA_INT) || (LA_TYPE == LA_FLOAT) || (LA_TYPE == LA_SHORT) # include <nlist.h> @@ -1504,12 +1504,8 @@ getla() # else /* LA_TYPE == LA_INT */ # if LA_TYPE == LA_SHORT short avenrun[3]; -# else -# if LA_TYPE == LA_LONGLONG - long long avenrun[3]; -# else /* LA_TYPE == LA_LONGLONG */ +# else /* LA_TYPE == LA_SHORT */ double avenrun[3]; -# endif /* LA_TYPE == LA_LONGLONG */ # endif /* LA_TYPE == LA_SHORT */ # endif /* LA_TYPE == LA_INT */ extern off_t lseek(); @@ -1575,7 +1571,7 @@ getla() sm_errstring(errno)); return -1; } -# if (LA_TYPE == LA_INT) || (LA_TYPE == LA_SHORT) || (LA_TYPE == LA_LONGLONG) +# if (LA_TYPE == LA_INT) || (LA_TYPE == LA_SHORT) if (tTd(3, 5)) { # if LA_TYPE == LA_SHORT @@ -1583,15 +1579,9 @@ getla() if (tTd(3, 15)) sm_dprintf(", %d, %d", avenrun[1], avenrun[2]); # else /* LA_TYPE == LA_SHORT */ -# if LA_TYPE == LA_LONGLONG - sm_dprintf("getla: avenrun = %lld", avenrun[0]); - if (tTd(3, 15)) - sm_dprintf(", %lld, %lld", avenrun[1], avenrun[2]); -# else /* LA_TYPE == LA_LONGLONG */ sm_dprintf("getla: avenrun = %ld", avenrun[0]); if (tTd(3, 15)) sm_dprintf(", %ld, %ld", avenrun[1], avenrun[2]); -# endif /* LA_TYPE == LA_LONGLONG */ # endif /* LA_TYPE == LA_SHORT */ sm_dprintf("\n"); } @@ -1599,7 +1589,7 @@ getla() sm_dprintf("getla: %d\n", (int) (avenrun[0] + FSCALE/2) >> FSHIFT); return ((int) (avenrun[0] + FSCALE/2) >> FSHIFT); -# else /* (LA_TYPE == LA_INT) || (LA_TYPE == LA_SHORT) || (LA_TYPE == LA_LONGLONG) */ +# else /* (LA_TYPE == LA_INT) || (LA_TYPE == LA_SHORT) */ if (tTd(3, 5)) { sm_dprintf("getla: avenrun = %g", avenrun[0]); @@ -1610,10 +1600,10 @@ getla() if (tTd(3, 1)) sm_dprintf("getla: %d\n", (int) (avenrun[0] +0.5)); return ((int) (avenrun[0] + 0.5)); -# endif /* (LA_TYPE == LA_INT) || (LA_TYPE == LA_SHORT) || (LA_TYPE == LA_LONGLONG) */ +# endif /* (LA_TYPE == LA_INT) || (LA_TYPE == LA_SHORT) */ } -#endif /* (LA_TYPE == LA_INT) || (LA_TYPE == LA_FLOAT) || (LA_TYPE == LA_SHORT) || (LA_TYPE == LA_LONGLONG) */ +#endif /* (LA_TYPE == LA_INT) || (LA_TYPE == LA_FLOAT) || (LA_TYPE == LA_SHORT) */ #if LA_TYPE == LA_READKSYM @@ -6051,10 +6041,6 @@ char *FFRCompileOptions[] = /* Problem noted by Anne Bennett of Concordia University */ "_FFR_DIGUNIX_SAFECHOWN", #endif /* _FFR_DIGUNIX_SAFECHOWN */ -#if _FFR_DM_PER_DAEMON - /* DeliveryMode per DaemonPortOptions: 'D' */ - "_FFR_DM_PER_DAEMON", -#endif /* _FFR_DM_PER_DAEMON */ #if _FFR_DNSMAP_ALIASABLE /* Allow dns map type to be used for aliases. */ /* Don Lewis of TDK */ @@ -6185,10 +6171,6 @@ char *FFRCompileOptions[] = /* Disable PIPELINING, delay client if used. */ "_FFR_NO_PIPE", #endif /* _FFR_NO_PIPE */ -#if _FFR_LOG_NTRIES - /* log ntries=, from Nik Clayton of FreeBSD */ - "_FFR_LOG_NTRIES", -#endif /* _FFR_LOG_NTRIES */ #if _FFR_PRIV_NOACTUALRECIPIENT /* ** PrivacyOptions=noactualrecipient stops sendmail from putting @@ -6196,7 +6178,7 @@ char *FFRCompileOptions[] = ** account that addresses map to. Patch from Dan Harkless. */ - "_FFR_PRIV_NOACTUALRECIPIENT", + "_FFR_PRIV_NOACTUALRECIPIENT" #endif /* _FFR_PRIV_NOACTUALRECIPIENT */ #if _FFR_QUEUEDELAY /* Exponential queue delay; disabled in 8.13 since it isn't used. */ @@ -6268,10 +6250,6 @@ char *FFRCompileOptions[] = /* Chris Adams of HiWAAY Informations Services */ "_FFR_SPT_ALIGN", #endif /* _FFR_SPT_ALIGN */ -#if _FFR_SS_PER_DAEMON - /* SuperSafe per DaemonPortOptions: 'T' (better letter?) */ - "_FFR_SS_PER_DAEMON", -#endif /* _FFR_SS_PER_DAEMON */ #if _FFR_TIMERS /* Donated code (unused). */ "_FFR_TIMERS", @@ -6289,9 +6267,6 @@ char *FFRCompileOptions[] = "_FFR_TRUSTED_QF", #endif /* _FFR_TRUSTED_QF */ -#if _FFR_USE_SEM_LOCKING - "_FFR_USE_SEM_LOCKING", -#endif /* _FFR_USE_SEM_LOCKING */ #if _FFR_USE_SETLOGIN /* Use setlogin() */ /* Peter Philipp */ diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index 892a2cf..ec0d376 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -9,6 +9,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ */ #include <sendmail.h> diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index 2ab0f4b..095700b 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -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.214 2005/02/04 22:01:45 ca Exp $") +SM_RCSID("@(#)$Id: mci.c,v 8.212 2004/08/04 21:11:31 ca Exp $") #if NETINET || NETINET6 # include <arpa/inet.h> 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$ |