Import sendmail 8.12.7

8 files changed, 144 insertions, 53 deletions

diff --git a/contrib/sendmail/include/libmilter/mfapi.h b/contrib/sendmail/include/libmilter/mfapi.h
index c36a38c..6d79030 100644
--- a/contrib/sendmail/include/libmilter/mfapi.h
+++ b/contrib/sendmail/include/libmilter/mfapi.h
@@ -7,7 +7,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: mfapi.h,v 8.44 2002/06/04 05:06:40 gshapiro Exp $
+ *	$Id: mfapi.h,v 8.44.2.3 2002/12/19 02:10:09 ca Exp $
  */
 
 /*
@@ -18,6 +18,7 @@
 # define _LIBMILTER_MFAPI_H	1
 
 # include <sys/types.h>
+
 # include <sys/socket.h>
 # include "libmilter/mfdef.h"
 
@@ -441,4 +442,4 @@ LIBMILTER_API int smfi_setpriv __P((SMFICTX *, void *));
 LIBMILTER_API void *smfi_getpriv __P((SMFICTX *));
 
 
-#endif /* !_LIBMILTER_MFAPI_H */
+#endif /* ! _LIBMILTER_MFAPI_H */
diff --git a/contrib/sendmail/include/libmilter/mfdef.h b/contrib/sendmail/include/libmilter/mfdef.h
index 649e98d..ab543e8 100644
--- a/contrib/sendmail/include/libmilter/mfdef.h
+++ b/contrib/sendmail/include/libmilter/mfdef.h
@@ -7,7 +7,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: mfdef.h,v 8.11 2001/09/12 18:02:19 gshapiro Exp $
+ *	$Id: mfdef.h,v 8.11.2.1 2002/11/11 23:22:28 ca Exp $
  */
 
 /*
@@ -62,6 +62,9 @@
 # define SMFIR_PROGRESS		'p'	/* progress */
 # define SMFIR_REJECT		'r'	/* reject */
 # define SMFIR_TEMPFAIL		't'	/* tempfail */
+# if _FFR_MILTER_421
+#  define SMFIR_SHUTDOWN	'4'	/* 421: shutdown (internal to MTA) */
+# endif /* _FFR_MILTER_421 */
 # define SMFIR_ADDHEADER	'h'	/* add header */
 # define SMFIR_REPLYCODE	'y'	/* reply code etc */
 # if _FFR_QUARANTINE
diff --git a/contrib/sendmail/include/libmilter/milter.h b/contrib/sendmail/include/libmilter/milter.h
index d9378faf..9d0d35d 100644
--- a/contrib/sendmail/include/libmilter/milter.h
+++ b/contrib/sendmail/include/libmilter/milter.h
@@ -7,7 +7,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: milter.h,v 8.37 2002/03/22 19:32:48 ca Exp $
+ *	$Id: milter.h,v 8.37.2.1 2002/12/19 02:10:09 ca Exp $
  */
 
 /*
@@ -52,4 +52,4 @@ struct smfi_str
 	void		*ctx_privdata;	/* private data */
 };
 
-#endif /* !_LIBMILTER_MILTER_H */
+#endif /* ! _LIBMILTER_MILTER_H */
diff --git a/contrib/sendmail/include/libsmdb/smdb.h b/contrib/sendmail/include/libsmdb/smdb.h
index 0c7f97d..c891ea5 100644
--- a/contrib/sendmail/include/libsmdb/smdb.h
+++ b/contrib/sendmail/include/libsmdb/smdb.h
@@ -6,7 +6,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: smdb.h,v 8.40 2002/05/24 23:20:14 gshapiro Exp $
+ *	$Id: smdb.h,v 8.40.2.1 2002/10/05 17:04:51 ca Exp $
  *
  */
 
@@ -23,10 +23,7 @@
 # endif /* NDBM */
 
 # ifdef NEWDB
-#  include <db.h>
-#  ifndef DB_VERSION_MAJOR
-#   define DB_VERSION_MAJOR 1
-#  endif /* ! DB_VERSION_MAJOR */
+#  include "sm/bdb.h"
 # endif /* NEWDB */
 
 /*
diff --git a/contrib/sendmail/include/sm/bdb.h b/contrib/sendmail/include/sm/bdb.h
new file mode 100644
index 0000000..34b6f7b
--- /dev/null
+++ b/contrib/sendmail/include/sm/bdb.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002 Sendmail, Inc. and its suppliers.
+ *	All rights reserved.
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the sendmail distribution.
+ *
+ *
+ *	$Id: bdb.h,v 1.1.2.3 2002/12/05 05:07:44 ca Exp $
+ */
+
+#ifndef	SM_BDB_H
+#define SM_BDB_H
+
+#if NEWDB
+# include <db.h>
+# ifndef DB_VERSION_MAJOR
+#  define DB_VERSION_MAJOR 1
+# endif /* ! DB_VERSION_MAJOR */
+
+# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+
+#  define DBTXN	NULL ,
+
+/*
+**  Always turn on DB_FCNTL_LOCKING for DB 4.1.x since its
+**  "workaround" for accepting an empty (locked) file depends on
+**  this flag. Notice: this requires 4.1.24 + patch (which should be
+**  part of 4.1.25).
+*/
+
+#  define SM_DB_FLAG_ADD(flag)	(flag) |= DB_FCNTL_LOCKING
+
+# else /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */
+
+#  define DBTXN
+#  if !HASFLOCK
+#   define SM_DB_FLAG_ADD(flag)	(flag) |= DB_FCNTL_LOCKING
+#  else /* !HASFLOCK */
+#   define SM_DB_FLAG_ADD(flag)	((void) 0)
+#  endif /* !HASFLOCK */
+
+# endif /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */
+#endif /* NEWDB */
+
+#endif /* ! SM_BDB_H */
diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h
index f154922..c76ab0f 100644
--- a/contrib/sendmail/include/sm/conf.h
+++ b/contrib/sendmail/include/sm/conf.h
@@ -10,7 +10,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: conf.h,v 1.90.2.4 2002/08/26 22:58:37 gshapiro Exp $
+ *	$Id: conf.h,v 1.90.2.13 2002/12/10 03:08:56 ca Exp $
  */
 
 /*
@@ -288,6 +288,10 @@ typedef int		pid_t;
 #  define SFS_TYPE	SFS_4ARGS	/* four argument statfs() call */
 #  define SFS_BAVAIL	f_bfree		/* alternate field name */
 #  define SYSLOG_BUFSIZE 512
+#  if defined(_SC_NPROC_ONLN) && !defined(_SC_NPROCESSORS_ONLN)
+    /* _SC_NPROC_ONLN is 'mpadmin -u', total # of unrestricted processors */
+#   define _SC_NPROCESSORS_ONLN	_SC_NPROC_ONLN
+#  endif /* if defined(_SC_NPROC_ONLN) && !defined(_SC_NPROCESSORS_ONLN) */
 #  ifdef IRIX6
 #   define STAT64	1
 #   define QUAD_T	unsigned long long
@@ -698,42 +702,45 @@ typedef int		pid_t;
 # endif /* NeXT */
 
 /*
-**  Apple Rhapsody
-**	Contributed by Wilfredo Sanchez <wsanchez@apple.com>
+**  Apple Darwin (aka Rhapsody)
 **
-**	Also used for Apple Darwin support.
+**      Contributed by Wilfredo Sanchez <wsanchez@mit.edu>
 */
 
 # if defined(DARWIN)
-#  define HASFCHMOD	1	/* has fchmod(2) syscall */
-#  define HASFLOCK	1	/* has flock(2) syscall */
-#  define HASUNAME	1	/* has uname(2) syscall */
-#  define HASUNSETENV	1
-#  define HASSETSID	1	/* has the setsid(2) POSIX syscall */
-#  define HASINITGROUPS	1
-#  define HASSETVBUF	1
-#  define HASSETREUID	0
-#  define HASSETEUID	1
-#  define USESETEUID	1	/* has usable seteuid(2) call */
-#  define HASLSTAT	1
-#  define HASSETRLIMIT	1
-#  define HASWAITPID	1
-#  define HASSTRERROR	1	/* has strerror(3) */
-#  define HASGETDTABLESIZE	1
-#  define HASGETUSERSHELL	1
-#  define HAS_IN_H	1
-#  define SM_CONF_GETOPT	0	/* need a replacement for getopt(3) */
-#  define BSD4_4_SOCKADDR	/* has sa_len */
-#  define NETLINK	1	/* supports AF_LINK */
-#  define HAS_ST_GEN	1	/* has st_gen field in stat struct */
-#  define GIDSET_T	gid_t
-#  define LA_TYPE	LA_SUBR		/* use getloadavg(3) */
-#  define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
-#  define SPT_TYPE	SPT_PSSTRINGS
-#  define SPT_PADCHAR	'\0'	/* pad process title with nulls */
-#  define ERRLIST_PREDEFINED	/* don't declare sys_errlist */
+#  define HASFCHMOD		1	/* has fchmod(2) */
+#  define HASFCHOWN		1	/* has fchown(2) */
+#  define HASFLOCK		1	/* has flock(2) */
+#  define HASUNAME		1	/* has uname(2) */
+#  define HASUNSETENV		1	/* has unsetenv(3) */
+#  define HASSETSID		1	/* has the setsid(2) */
+#  define HASINITGROUPS	1	/* has initgroups(3) */
+#  define HASSETVBUF		1	/* has setvbuf (3) */
+#  define HASSETREUID		0	/* setreuid(2) unusable */
+#  define HASSETEUID		1	/* has seteuid(2) */
+#  define USESETEUID		1	/* has seteuid(2) */
+#  define HASSETEGID		1	/* has setegid(2) */
+#  define HASSETREGID		1	/* has setregid(2) */
+#  define HASSETRESGID		0	/* no setresgid(2) */
+#  define HASLSTAT		1	/* has lstat(2) */
+#  define HASSETRLIMIT		1	/* has setrlimit(2) */
+#  define HASWAITPID		1	/* has waitpid(2) */
+#  define HASGETDTABLESIZE	1	/* has getdtablesize(2) */
+#  define HAS_ST_GEN		1	/* has st_gen field in struct stat */
+#  define HASURANDOMDEV	1	/* has urandom(4) */
+#  define HASSTRERROR		1	/* has strerror(3) */
+#  define HASGETUSERSHELL	1	/* had getusershell(3) */
+#  define GIDSET_T		gid_t	/* getgroups(2) takes gid_t */
+#  define LA_TYPE		LA_SUBR	/* use getloadavg(3) */
+#  define SFS_TYPE		SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
+#  define SPT_TYPE		SPT_PSSTRINGS	/* use magic PS_STRINGS pointer for setproctitle */
+#  define ERRLIST_PREDEFINED		/* don't declare sys_errlist */
+#  define BSD4_4_SOCKADDR		/* struct sockaddr has sa_len */
+#  define SAFENFSPATHCONF	0	/* unverified: pathconf(2) doesn't work on NFS */
+#  define HAS_IN_H		1
+#  define NETLINK		1	/* supports AF_LINK */
 #  ifndef NOT_SENDMAIL
-#   define sleep		sleepX
+#   define sleep sleepX
 extern unsigned int sleepX __P((unsigned int seconds));
 #  endif /* ! NOT_SENDMAIL */
 # endif /* defined(DARWIN) */
@@ -1300,10 +1307,6 @@ extern void		*malloc();
 **	Florian La Roche <rzsfl@rz.uni-sb.de>
 **	Karl London <karl@borg.demon.co.uk>
 **
-**  Last compiled against:	[07/21/98 @ 11:47:34 AM (Tuesday)]
-**	sendmail 8.9.1		bind-8.1.2		db-2.4.14
-**	gcc-2.8.1		glibc-2.0.94		linux-2.1.109
-**
 **  NOTE: Override HASFLOCK as you will but, as of 1.99.6, mixed-style
 **	file locking is no longer allowed.  In particular, make sure
 **	your DBM library and sendmail are both using either flock(2)
@@ -1323,7 +1326,6 @@ extern void		*malloc();
 #  ifndef USESETEUID
 #   define USESETEUID	0	/* has it due to POSIX, but doesn't work */
 #  endif /* USESETEUID */
-#  define SM_CONF_GETOPT	0	/* need a replacement for getopt(3) */
 #  define HASUNAME	1	/* use System V uname(2) system call */
 #  define HASUNSETENV	1	/* has unsetenv(3) call */
 #  define ERRLIST_PREDEFINED	/* don't declare sys_errlist */
@@ -2216,6 +2218,26 @@ typedef struct msgb		mblk_t;
 #  define _PATH_SENDMAILPID	"/var/run/sendmail.pid"
 # endif /* MOTO */
 
+/*
+**  Interix
+**	Contributed by Nedelcho Stanev <nedelcho.stanev@atlanticsky.com>
+**
+**	Used for Interix support.
+*/
+
+# if defined(__INTERIX)
+#  define HASURANDOMDEV		1
+#  define HASGETUSERSHELL	0
+#  define HASSTRERROR		1
+#  define HASUNSETENV		1
+#  define HASFCHOWN		1
+#  undef HAVE_SYS_ERRLIST
+#  define sys_errlist		__sys_errlist
+#  define sys_nerr		__sys_nerr
+#  define major(dev)		((int)(((dev) >> 8) & 0xff)
+#  define minor(dev)		((int)((dev) & 0xff)
+# endif /* defined(__INTERIX) */
+
 
 /**********************************************************************
 **  End of Per-Operating System defines
@@ -2696,6 +2718,11 @@ typedef void		(*sigfunc_t) __P((int));
 #  define SYSLOG_BUFSIZE	1024
 # endif /* ! SYSLOG_BUFSIZE */
 
+/* for FD_SET() */
+#ifndef FD_SETSIZE
+# define FD_SETSIZE	256
+#endif /* ! FD_SETSIZE */
+
 /*
 **  Size of prescan buffer.
 **	Despite comments in the _sendmail_ book, this probably should
diff --git a/contrib/sendmail/include/sm/fdset.h b/contrib/sendmail/include/sm/fdset.h
index 6f13411..31a0e30 100644
--- a/contrib/sendmail/include/sm/fdset.h
+++ b/contrib/sendmail/include/sm/fdset.h
@@ -1,19 +1,25 @@
 /*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001, 2002 Sendmail, Inc. and its suppliers.
  *      All rights reserved.
  *
  * By using this file, you agree to the terms and conditions set
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: fdset.h,v 1.3 2001/03/30 23:45:31 geir Exp $
+ *	$Id: fdset.h,v 1.3.10.2 2002/12/10 04:02:25 ca Exp $
  */
 
 #ifndef	SM_FDSET_H
 # define SM_FDSET_H
 
+/*
+**  Note: SM_FD_OK_SELECT(fd) requires that ValidSocket(fd) has been checked
+**	before.
+*/
+
 #  define SM_FD_SET(fd, pfdset)		FD_SET(fd, pfdset)
 #  define SM_FD_ISSET(fd, pfdset)	FD_ISSET(fd, pfdset)
-#  define SM_FD_SETSIZE	FD_SETSIZE
+#  define SM_FD_SETSIZE			FD_SETSIZE
+#  define SM_FD_OK_SELECT(fd)		(FD_SETSIZE <= 0 || (fd) < FD_SETSIZE)
 
 #endif /* SM_FDSET_H */
diff --git a/contrib/sendmail/include/sm/os/sm_os_unixware.h b/contrib/sendmail/include/sm/os/sm_os_unixware.h
index 2ff5ad0..aac431e 100644
--- a/contrib/sendmail/include/sm/os/sm_os_unixware.h
+++ b/contrib/sendmail/include/sm/os/sm_os_unixware.h
@@ -1,16 +1,24 @@
 /*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001, 2002 Sendmail, Inc. and its suppliers.
  *	All rights reserved.
  *
  * By using this file, you agree to the terms and conditions set
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: sm_os_unixware.h,v 1.7 2001/11/11 16:32:00 ca Exp $
+ *	$Id: sm_os_unixware.h,v 1.7.2.1 2002/10/24 18:02:14 ca Exp $
  */
 
 #define SM_OS_NAME	"unixware"
 
+#ifndef SM_CONF_LONGLONG
+# if defined(__SCO_VERSION__) && __SCO_VERSION__ > 400000000L
+#  define SM_CONF_LONGLONG	1
+#  define SM_CONF_TEST_LLONG	1
+#  define SM_CONF_BROKEN_SIZE_T	0
+# endif /* defined(__SCO_VERSION__) && __SCO_VERSION__ > 400000000L */
+#endif /* !SM_CONF_LONGLONG */
+
 /* try LLONG tests in libsm/t-types.c? */
 #ifndef SM_CONF_TEST_LLONG
 # define SM_CONF_TEST_LLONG	0
@@ -24,7 +32,9 @@
 #endif /* SM_CONF_SHM */
 
 /* size_t seems to be signed */
-#define SM_CONF_BROKEN_SIZE_T	1
+#ifndef SM_CONF_BROKEN_SIZE_T
+# define SM_CONF_BROKEN_SIZE_T	1
+#endif /* SM_CONF_BROKEN_SIZE_T */
 
 /* don't use flock() in mail.local.c */
 #ifndef LDA_USE_LOCKF