diff options
Diffstat (limited to 'contrib/sendmail/src')
-rw-r--r-- | contrib/sendmail/src/aliases.5 | 4 | ||||
-rw-r--r-- | contrib/sendmail/src/conf.c | 61 | ||||
-rw-r--r-- | contrib/sendmail/src/conf.h | 14 | ||||
-rw-r--r-- | contrib/sendmail/src/err.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/src/headers.c | 2 | ||||
-rw-r--r-- | contrib/sendmail/src/mailq.1 | 8 | ||||
-rw-r--r-- | contrib/sendmail/src/mci.c | 10 | ||||
-rw-r--r-- | contrib/sendmail/src/savemail.c | 17 | ||||
-rw-r--r-- | contrib/sendmail/src/sendmail.8 | 17 |
9 files changed, 47 insertions, 90 deletions
diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5 index 62b5dfb..cb1de4b 100644 --- a/contrib/sendmail/src/aliases.5 +++ b/contrib/sendmail/src/aliases.5 @@ -9,7 +9,9 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: aliases.5,v 8.17 2000/12/14 23:09:46 gshapiro Exp $ +.\" $Id: aliases.5,v 1.1.1.5 2002/02/17 21:56:38 gshapiro Exp $ +.\" +.\" $FreeBSD$ .\" .TH ALIASES 5 "$Date: 2000/12/14 23:09:46 $" .SH NAME diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index 4a0a25d..06a48eb 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -13,7 +13,9 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: conf.c,v 8.969 2002/05/24 23:48:55 gshapiro Exp $") +SM_RCSID("@(#)$Id: conf.c,v 1.1.1.12 2002/04/10 03:04:48 gshapiro Exp $") + +/* $FreeBSD$ */ #include <sendmail/pathnames.h> @@ -2327,25 +2329,6 @@ typedef unsigned int *pt_entry_t; # define SPT_BUFSIZE MAXLINE #endif /* ! SPT_BUFSIZE */ -#if _FFR_SPT_ALIGN - -/* -** It looks like the Compaq Tru64 5.1A now aligns argv and envp to -** 64 bit alignment, so unless each piece of argv and envp is a multiple -** of 8 bytes (including terminating NULL), initsetproctitle() won't use -** any of the space beyond argv[0]. Be sure to set SPT_ALIGN_SIZE if -** you use this FFR. -*/ - -# ifdef SPT_ALIGN_SIZE -# define SPT_ALIGN(x, align) ((((x) + SPT_ALIGN_SIZE) >> (align)) << (align)) -# else /* SPT_ALIGN_SIZE */ -# define SPT_ALIGN(x, align) (x) -# endif /* SPT_ALIGN_SIZE */ -#else /* _FFR_SPT_ALIGN */ -# define SPT_ALIGN(x, align) (x) -#endif /* _FFR_SPT_ALIGN */ - /* ** Pointers for setproctitle. ** This allows "ps" listings to give more useful information. @@ -2364,7 +2347,6 @@ initsetproctitle(argc, argv, envp) char **envp; { register int i; - int align; extern char **environ; /* @@ -2389,24 +2371,15 @@ initsetproctitle(argc, argv, envp) ** Determine how much space we can use for setproctitle. ** Use all contiguous argv and envp pointers starting at argv[0] */ - - align = -1; -#if _FFR_SPT_ALIGN -# ifdef SPT_ALIGN_SIZE - for (i = SPT_ALIGN_SIZE; i > 0; i >>= 1) - align++; -# endif /* SPT_ALIGN_SIZE */ -#endif /* _FFR_SPT_ALIGN */ - for (i = 0; i < argc; i++) { if (i == 0 || LastArgv + 1 == argv[i]) - LastArgv = argv[i] + SPT_ALIGN(strlen(argv[i]), align); + LastArgv = argv[i] + strlen(argv[i]); } for (i = 0; LastArgv != NULL && envp[i] != NULL; i++) { if (LastArgv + 1 == envp[i]) - LastArgv = envp[i] + SPT_ALIGN(strlen(envp[i]), align); + LastArgv = envp[i] + strlen(envp[i]); } } @@ -2771,8 +2744,7 @@ uname(name) { char buf[MAXLINE]; - while (sm_io_fgets(file, SM_TIME_DEFAULT, - buf, sizeof buf) != NULL) + while (sm_io_fgets(file, SM_TIME_DEFAULT, buf, MAXLINE) != NULL) { if (sm_io_sscanf(buf, "#define sysname \"%*[^\"]\"", NODE_LENGTH, name->nodename) > 0) @@ -5584,11 +5556,7 @@ char *CompileOptions[] = "PIPELINING", #endif /* PIPELINING */ #if SASL -# if SASL >= 20000 - "SASLv2", -# else /* SASL >= 20000 */ "SASL", -# endif /* SASL >= 20000 */ #endif /* SASL */ #if SCANF "SCANF", @@ -5865,9 +5833,6 @@ char *FFRCompileOptions[] = #if _FFR_CHECK_EOM "_FFR_CHECK_EOM", #endif /* _FFR_CHECK_EOM */ -#if _FFR_CHK_QUEUE - "_FFR_CHK_QUEUE", -#endif /* _FFR_CHK_QUEUE */ #if _FFR_CONTROL_MSTAT "_FFR_CONTROL_MSTAT", #endif /* _FFR_CONTROL_MSTAT */ @@ -5983,35 +5948,21 @@ char *FFRCompileOptions[] = #if _FFR_RESET_MACRO_GLOBALS "_FFR_RESET_MACRO_GLOBALS", #endif /* _FFR_RESET_MACRO_GLOBALS */ -#if _FFR_RESPOND_ALL - /* in vacation */ - "_FFR_RESPOND_ALL", -#endif /* _FFR_RESPOND_ALL */ #if _FFR_RHS "_FFR_RHS", #endif /* _FFR_RHS */ -#if _FFR_SASL_OPT_M - "_FFR_SASL_OPT_M", -#endif /* _FFR_SASL_OPT_M */ #if _FFR_SELECT_SHM "_FFR_SELECT_SHM", #endif /* _FFR_SELECT_SHM */ #if _FFR_SHM_STATUS "_FFR_SHM_STATUS", #endif /* _FFR_SHM_STATUS */ -#if _FFR_SMFI_OPENSOCKET - "_FFR_SMFI_OPENSOCKET", -#endif /* _FFR_SMFI_OPENSOCKET */ #if _FFR_SMTP_SSL "_FFR_SMTP_SSL", #endif /* _FFR_SMTP_SSL */ #if _FFR_SOFT_BOUNCE "_FFR_SOFT_BOUNCE", #endif /* _FFR_SOFT_BOUNCE */ -#if _FFR_SPT_ALIGN -/* Chris Adams of HiWAAY Informations Services */ - "_FFR_SPT_ALIGN", -#endif /* _FFR_SPT_ALIGN */ #if _FFR_TIMERS "_FFR_TIMERS", #endif /* _FFR_TIMERS */ diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index 89bdd7e..2903b7b 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -10,9 +10,11 @@ * the sendmail distribution. * * - * $Id: conf.h,v 8.562 2002/05/22 19:46:26 gshapiro Exp $ + * $Id: conf.h,v 1.1.1.12 2002/04/10 03:04:48 gshapiro Exp $ */ +/* $FreeBSD$ */ + /* ** CONF.H -- All user-configurable parameters for sendmail ** @@ -133,16 +135,6 @@ struct rusage; /* forward declaration to get gcc to shut up in wait.h */ # endif /* ! AUTH_MECHANISMS */ #endif /* SASL */ -/* -** Default database permissions (alias, maps, etc.) -** Used by sendmail and libsmdb -*/ - -#ifndef DBMMODE -# define DBMMODE 0640 -#endif /* ! DBMMODE */ - - /********************************************************************** ** Compilation options. ** #define these to 1 if they are available; diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c index 484af9e..ee57d684 100644 --- a/contrib/sendmail/src/err.c +++ b/contrib/sendmail/src/err.c @@ -13,7 +13,9 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: err.c,v 8.189 2002/01/09 18:52:30 ca Exp $") +SM_RCSID("@(#)$Id: err.c,v 1.1.1.7 2002/02/17 21:56:39 gshapiro Exp $") + +/* $FreeBSD$ */ #if LDAPMAP # include <lber.h> diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index a56266e..efb4f3c 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -13,6 +13,8 @@ #include <sendmail.h> +/* $FreeBSD$ */ + SM_RCSID("@(#)$Id: headers.c,v 8.266 2001/10/12 01:50:12 gshapiro Exp $") static size_t fix_mime_header __P((char *)); diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1 index 0fae3ad..6f5a13e 100644 --- a/contrib/sendmail/src/mailq.1 +++ b/contrib/sendmail/src/mailq.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998-2000, 2002 Sendmail, Inc. and its suppliers. +.\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. .\" All rights reserved. .\" Copyright (c) 1983, 1997 Eric P. Allman. All rights reserved. .\" Copyright (c) 1985, 1990, 1993 @@ -9,9 +9,11 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: mailq.1,v 8.19 2002/04/12 05:07:58 gshapiro Exp $ +.\" $Id: mailq.1,v 1.1.1.6 2002/02/17 21:56:39 gshapiro Exp $ .\" -.TH MAILQ 1 "$Date: 2002/04/12 05:07:58 $" +.\" $FreeBSD$ +.\" +.TH MAILQ 1 "$Date: 2000/12/23 19:37:48 $" .SH NAME mailq \- print the mail queue diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index b54b13d..e5c43b2 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -11,9 +11,11 @@ * */ +/* $FreeBSD$ */ + #include <sendmail.h> -SM_RCSID("@(#)$Id: mci.c,v 8.205 2002/05/24 18:53:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: mci.c,v 1.1.1.7 2002/04/10 03:04:50 gshapiro Exp $") #if NETINET || NETINET6 # include <arpa/inet.h> @@ -654,7 +656,7 @@ mci_lock_host_statfile(mci) { int save_errno = errno; int retVal = EX_OK; - char fname[MAXPATHLEN]; + char fname[MAXPATHLEN + 1]; if (HostStatDir == NULL || mci->mci_host == NULL) return EX_OK; @@ -773,7 +775,7 @@ mci_load_persistent(mci) int save_errno = errno; bool locked = true; SM_FILE_T *fp; - char fname[MAXPATHLEN]; + char fname[MAXPATHLEN + 1]; if (mci == NULL) { @@ -1060,7 +1062,7 @@ mci_traverse_persistent(action, pathname) size_t len; char *newptr; struct dirent *e; - char newpath[MAXPATHLEN]; + char newpath[MAXPATHLEN + 1]; if ((d = opendir(pathname)) == NULL) { diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index b28a70d..da386e2 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -11,9 +11,11 @@ * */ +/* $FreeBSD$ */ + #include <sendmail.h> -SM_RCSID("@(#)$Id: savemail.c,v 8.299 2002/05/24 20:50:17 gshapiro Exp $") +SM_RCSID("@(#)$Id: savemail.c,v 1.1.1.9 2002/02/17 21:56:41 gshapiro Exp $") static void errbody __P((MCI *, ENVELOPE *, char *)); static bool pruneroute __P((char *)); @@ -65,7 +67,6 @@ savemail(e, sendbody) int flags; long sff; char buf[MAXLINE + 1]; - char dlbuf[MAXPATHLEN]; SM_MBDB_T user; @@ -366,20 +367,20 @@ savemail(e, sendbody) p = macvalue('g', e); macdefine(&e->e_macro, A_PERM, 'g', e->e_sender); - expand("\201z/dead.letter", dlbuf, sizeof dlbuf, e); + expand("\201z/dead.letter", buf, sizeof buf, e); sff = SFF_CREAT|SFF_REGONLY|SFF_RUNASREALUID; if (RealUid == 0) sff |= SFF_ROOTOK; - e->e_to = dlbuf; - if (writable(dlbuf, NULL, sff) && - mailfile(dlbuf, FileMailer, NULL, sff, e) == EX_OK) + e->e_to = buf; + if (writable(buf, NULL, sff) && + mailfile(buf, FileMailer, NULL, sff, e) == EX_OK) { int oldverb = Verbose; if (OpMode != MD_DAEMON && OpMode != MD_SMTP) Verbose = 1; if (Verbose > 0) - message("Saved message in %s", dlbuf); + message("Saved message in %s", buf); Verbose = oldverb; macdefine(&e->e_macro, A_PERM, 'g', p); state = ESM_DONE; diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8 index cf473c5..2abfedd 100644 --- a/contrib/sendmail/src/sendmail.8 +++ b/contrib/sendmail/src/sendmail.8 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. +.\" Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. .\" All rights reserved. .\" Copyright (c) 1983, 1997 Eric P. Allman. All rights reserved. .\" Copyright (c) 1988, 1991, 1993 @@ -9,9 +9,11 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: sendmail.8,v 8.51 2002/05/24 15:42:13 ca Exp $ +.\" $Id: sendmail.8,v 1.1.1.6 2002/02/17 21:56:41 gshapiro Exp $ .\" -.TH SENDMAIL 8 "$Date: 2002/05/24 15:42:13 $" +.\" $FreeBSD$ +.\" +.TH SENDMAIL 8 "$Date: 2001/03/23 22:10:00 $" .SH NAME sendmail \- an electronic mail transport agent @@ -93,7 +95,8 @@ the ``From:'' and ``Sender:'' fields are examined for the name of the sender. .TP .B \-bd -Run as a daemon. +Run as a daemon. This requires Berkeley +IPC. .B Sendmail will fork and run in background listening on socket 25 for incoming @@ -687,13 +690,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 |