Import sendmail 8.12.10

5 files changed, 56 insertions, 21 deletions

diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h
index b3863f1..0653410 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.14 2003/03/06 18:38:06 ca Exp $
+ *	$Id: conf.h,v 1.90.2.18 2003/08/20 22:27:44 ca Exp $
  */
 
 /*
@@ -102,7 +102,9 @@
 #  endif /* ! HASGETUSERSHELL */
 #  ifdef HPUX10
 #   define _PATH_SENDMAIL	"/usr/sbin/sendmail"
-#   define SMRSH_CMDDIR		"/var/adm/sm.bin"
+#   ifndef SMRSH_CMDDIR
+#    define SMRSH_CMDDIR	"/var/adm/sm.bin"
+#   endif /* ! SMRSH_CMDDIR */
 #  endif /* HPUX10 */
 #  ifdef HPUX11
 #   define HASSETREUID	1	/* setreuid(2) works on HP-UX 11.x */
@@ -110,7 +112,9 @@
 #   ifndef BROKEN_RES_SEARCH
 #    define BROKEN_RES_SEARCH 1	/* res_search(unknown) returns h_errno=0 */
 #   endif /* ! BROKEN_RES_SEARCH */
-#   define SMRSH_CMDDIR		"/var/adm/sm.bin"
+#   ifndef SMRSH_CMDDIR
+#    define SMRSH_CMDDIR	"/var/adm/sm.bin"
+#   endif /* ! SMRSH_CMDDIR */
 #   define _PATH_SENDMAIL	"/usr/sbin/sendmail"
 #  else /* HPUX11 */
 #   ifndef NOT_SENDMAIL
@@ -157,6 +161,9 @@ extern void	hard_syslog();
 
 # ifdef _AIX5
 #  define _AIX4		40300
+#  if _AIX5 >= 50200
+#   define HASUNSETENV	1	/* has unsetenv(3) call */
+#  endif /* _AIX5 >= 50200 */
 # endif /* _AIX5 */
 
 /*
@@ -422,7 +429,9 @@ typedef int		pid_t;
 #   if SOLARIS >= 20800 || (SOLARIS < 10000 && SOLARIS >= 208)
 #    undef _PATH_SENDMAILPID	/* tmpfs /var/run added in 2.8 */
 #    define _PATH_SENDMAILPID	"/var/run/sendmail.pid"
-#    define SMRSH_CMDDIR		"/var/adm/sm.bin"
+#    ifndef SMRSH_CMDDIR
+#     define SMRSH_CMDDIR	"/var/adm/sm.bin"
+#    endif /* ! SMRSH_CMDDIR */
 #    define SL_FUDGE	34	/* fudge offset for SyslogPrefixLen */
 #   endif /* SOLARIS >= 20800 || (SOLARIS < 10000 && SOLARIS >= 208) */
 #   if SOLARIS >= 20900 || (SOLARIS < 10000 && SOLARIS >= 209)
@@ -907,8 +916,12 @@ extern unsigned int sleepX __P((unsigned int seconds));
 #     define HASSETUSERCONTEXT	1	/* BSDI-style login classes */
 #    endif /* __FreeBSD_version >= 222000 */
 #    if __FreeBSD_version >= 330000	/* 3.3.0-release and later */
-#     define SMRSH_CMDDIR	"/usr/libexec/sm.bin"
-#     define SMRSH_PATH		"/bin:/usr/bin"
+#     ifndef SMRSH_CMDDIR
+#      define SMRSH_CMDDIR	"/usr/libexec/sm.bin"
+#     endif /* ! SMRSH_CMDDIR */
+#     ifndef SMRSH_PATH
+#      define SMRSH_PATH	"/bin:/usr/bin"
+#     endif /* ! SMRSH_PATH */
 #    endif /* __FreeBSD_version >= 330000 */
 #    define USESYSCTL		1	/* use sysctl(3) for getting ncpus */
 #    include <sys/sysctl.h>
@@ -922,7 +935,9 @@ extern unsigned int sleepX __P((unsigned int seconds));
 #   undef SPT_TYPE
 #   define SPT_TYPE	SPT_BUILTIN	/* setproctitle is in libc */
 #   define HASSETLOGIN	1	/* has setlogin(2) */
-#   define HASSETREUID	0	/* OpenBSD has broken setreuid(2) emulation */
+#   if OpenBSD < 200305
+#    define HASSETREUID	0	/* setreuid(2) broken in OpenBSD < 3.3 */
+#   endif /* OpenBSD < 200305 */
 #   define HASSETEGID	1	/* use setegid(2) to set saved gid */
 #   define HASURANDOMDEV	1	/* has /dev/urandom(4) */
 #   if OpenBSD >= 200006
@@ -1360,6 +1375,11 @@ extern void		*malloc();
 #    define HASURANDOMDEV 1	/* 2.0 (at least) has linux/drivers/char/random.c */
 #   endif /* ! HASURANDOMDEV */
 #  endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0)) */
+#  if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+#   ifndef HASSTRERROR
+#    define HASSTRERROR	1	/* has strerror(3) */
+#   endif /* HASSTRERROR */
+#  endif /* defined(__GLIBC__) && defined(__GLIBC_MINOR__) */
 #  ifndef TZ_TYPE
 #   define TZ_TYPE	TZ_NONE		/* no standard for Linux */
 #  endif /* ! TZ_TYPE */
@@ -1385,7 +1405,6 @@ extern void		*malloc();
    **  in 2.1 and later, but the APIs appear before the functions.
    */
 #   if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-#    define HASSTRERROR	1	/* has strerror(3) */
 #    define GLIBC_VERSION ((__GLIBC__ << 8) + __GLIBC_MINOR__)
 #    if (GLIBC_VERSION >= 0x201)
 #     undef IPPROTO_ICMPV6	/* linux #defines, glibc enums */
@@ -2547,7 +2566,7 @@ typedef struct msgb		mblk_t;
 # endif /* ! EX_CONFIG */
 
 /* pseudo-codes */
-# define EX_QUIT		22	/* drop out of server immediately */
+# define EX_QUIT	22	/* drop out of server immediately */
 # define EX_RESTART	23	/* restart sendmail daemon */
 # define EX_SHUTDOWN	24	/* shutdown sendmail daemon */
 
diff --git a/contrib/sendmail/include/sm/errstring.h b/contrib/sendmail/include/sm/errstring.h
index c5447d1..cc69c51 100644
--- a/contrib/sendmail/include/sm/errstring.h
+++ b/contrib/sendmail/include/sm/errstring.h
@@ -1,13 +1,12 @@
 /*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001, 2003 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: errstring.h,v 1.4 2001/06/07 20:04:53 ca Exp $
+ *	$Id: errstring.h,v 1.4.4.3 2003/06/24 17:16:10 ca Exp $
  */
 
 /*
@@ -46,6 +45,7 @@ extern int errno;
 #define E_SMDBBASE	(E_PSEUDOBASE + 40)	/* base for libsmdb errors */
 #define E_LDAPBASE	(E_PSEUDOBASE + 70)	/* base for LDAP errors */
 
+
 /* libsmdb */
 #define SMDBE_OK			0
 #define SMDBE_MALLOC			(E_SMDBBASE + 1)
@@ -71,9 +71,9 @@ extern int errno;
 #define SMDBE_NOT_A_VALID_CURSOR	(E_SMDBBASE + 21)
 #define SMDBE_LAST_ENTRY		(E_SMDBBASE + 22)
 #define SMDBE_OLD_VERSION		(E_SMDBBASE + 23)
+#define SMDBE_VERSION_MISMATCH		(E_SMDBBASE + 24)
+
+extern const char *sm_errstring __P((int _errno));
 
-extern const char *
-sm_errstring __P((
-	int _errno));
 
 #endif /* SM_ERRSTRING_H */
diff --git a/contrib/sendmail/include/sm/io.h b/contrib/sendmail/include/sm/io.h
index 48b358d..0e50c23 100644
--- a/contrib/sendmail/include/sm/io.h
+++ b/contrib/sendmail/include/sm/io.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2003 Sendmail, Inc. and its suppliers.
  *      All rights reserved.
  * Copyright (c) 1990
  * 	 The Regents of the University of California.  All rights reserved.
@@ -11,7 +11,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: io.h,v 1.23 2002/02/23 19:32:17 gshapiro Exp $
+ *	$Id: io.h,v 1.23.2.2 2003/09/05 20:35:28 ca Exp $
  */
 
 /*-
@@ -33,6 +33,17 @@
 #define SM_IO_APPENDRW	5	/* read-write from eof */
 #define SM_IO_RDWRTR	6	/* read-write with truncation indicated */
 
+# define SM_IO_BINARY	0x0	/* binary mode: not used in Unix */
+#define SM_IS_BINARY(mode)	((mode) & SM_IO_BINARY != 0)
+#define SM_IO_MODE(mode)	((mode) & 0x0f)
+
+#define SM_IO_RDWR_B		(SM_IO_RDWR|SM_IO_BINARY)
+#define SM_IO_RDONLY_B		(SM_IO_RDONLY|SM_IO_BINARY)
+#define SM_IO_WRONLY_B		(SM_IO_WRONLY|SM_IO_BINARY)
+#define SM_IO_APPEND_B		(SM_IO_APPEND|SM_IO_BINARY)
+#define SM_IO_APPENDRW_B	(SM_IO_APPENDRW|SM_IO_BINARY)
+#define SM_IO_RDWRTR_B		(SM_IO_RDWRTR|SM_IO_BINARY)
+
 /* for sm_io_fseek, et al api's (exposed) */
 #define SM_IO_SEEK_SET	0
 #define SM_IO_SEEK_CUR	1
diff --git a/contrib/sendmail/include/sm/os/sm_os_aix.h b/contrib/sendmail/include/sm/os/sm_os_aix.h
index 6dc4a54..9c3f469 100644
--- a/contrib/sendmail/include/sm/os/sm_os_aix.h
+++ b/contrib/sendmail/include/sm/os/sm_os_aix.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2003 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_aix.h,v 1.9 2001/10/09 23:12:13 ca Exp $
+ *	$Id: sm_os_aix.h,v 1.9.2.1 2003/04/28 23:11:07 ca Exp $
  */
 
 /*
@@ -33,3 +33,7 @@
 #  endif /* SM_CONF_SYSLOG */
 # endif /* ! _AIX4 */
 #endif /* _AIX3 */
+
+#if _AIX5 >= 50200
+# define SM_CONF_LONGLONG	1
+#endif /* _AIX5 >= 50200 */
diff --git a/contrib/sendmail/include/sm/shm.h b/contrib/sendmail/include/sm/shm.h
index 6375dfc..36033ed 100644
--- a/contrib/sendmail/include/sm/shm.h
+++ b/contrib/sendmail/include/sm/shm.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2003 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: shm.h,v 1.8 2002/04/10 23:11:35 ca Exp $
+ *	$Id: shm.h,v 1.8.2.2 2003/05/17 18:34:16 ca Exp $
  */
 
 #ifndef SM_SHM_H
@@ -29,6 +29,7 @@
 extern void *sm_shmstart __P((key_t, int , int , int *, bool));
 extern int sm_shmstop __P((void *, int, bool));
 
+
 /* for those braindead systems... (e.g., SunOS 4) */
 #  ifndef SHM_R
 #   define SHM_R       0400