5 files changed, 52 insertions, 11 deletions
diff --git a/include/libmilter/mfapi.h b/include/libmilter/mfapi.h
index 7d7fb1d99f57..8e3a17328615 100644
--- a/include/libmilter/mfapi.h
+++ b/include/libmilter/mfapi.h
@@ -7,7 +7,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: mfapi.h,v 8.78 2008/02/27 22:30:34 ca Exp $
+ *	$Id: mfapi.h,v 8.80 2009/11/06 00:57:08 ca Exp $
  */
 
 /*
@@ -18,7 +18,14 @@
 # define _LIBMILTER_MFAPI_H	1
 
 #ifndef SMFI_VERSION
-# define SMFI_VERSION	0x01000001	/* libmilter version number */
+# if _FFR_MDS_NEGOTIATE
+#  define SMFI_VERSION	0x01000002	/* libmilter version number */
+
+   /* first libmilter version that has MDS support */
+#  define SMFI_VERSION_MDS	0x01000002
+# else /* _FFR_MDS_NEGOTIATE */
+#  define SMFI_VERSION	0x01000001	/* libmilter version number */
+# endif /* _FFR_MDS_NEGOTIATE */
 #endif /* ! SMFI_VERSION */
 
 #define SM_LM_VRS_MAJOR(v)	(((v) & 0x7f000000) >> 24)
@@ -163,9 +170,7 @@ LIBMILTER_API int smfi_setdbg __P((int));
 LIBMILTER_API int smfi_settimeout __P((int));
 LIBMILTER_API int smfi_setconn __P((char *));
 LIBMILTER_API int smfi_stop __P((void));
-#if _FFR_MAXDATASIZE
 LIBMILTER_API size_t smfi_setmaxdatasize __P((size_t));
-#endif /* _FFR_MAXDATASIZE */
 LIBMILTER_API int smfi_version __P((unsigned int *, unsigned int *, unsigned int *));
 
 /*
diff --git a/include/libmilter/mfdef.h b/include/libmilter/mfdef.h
index 674856707de4..f42ec026cc92 100644
--- a/include/libmilter/mfdef.h
+++ b/include/libmilter/mfdef.h
@@ -7,7 +7,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: mfdef.h,v 8.38 2007/03/27 18:53:48 ca Exp $
+ *	$Id: mfdef.h,v 8.39 2009/11/06 00:57:08 ca Exp $
  */
 
 /*
@@ -27,6 +27,12 @@
 #define MILTER_CHUNK_SIZE	65535	/* body chunk size */
 #define MILTER_MAX_DATA_SIZE	65535	/* default milter command data limit */
 
+#if _FFR_MDS_NEGOTIATE
+# define MILTER_MDS_64K	((64 * 1024) - 1)
+# define MILTER_MDS_256K ((256 * 1024) - 1)
+# define MILTER_MDS_1M	((1024 * 1024) - 1)
+#endif /* _FFR_MDS_NEGOTIATE */
+
 /* These apply to SMFIF_* flags */
 #define SMFI_V1_ACTS	0x0000000FL	/* The actions of V1 filter */
 #define SMFI_V2_ACTS	0x0000003FL	/* The actions of V2 filter */
@@ -100,6 +106,9 @@
 #define SMFIP_NR_EOH	0x00040000L	/* No reply for eoh */
 #define SMFIP_NR_BODY	0x00080000L	/* No reply for body chunk */
 #define SMFIP_HDR_LEADSPC 0x00100000L	/* header value leading space */
+#define SMFIP_MDS_256K	0x10000000L	/* MILTER_MAX_DATA_SIZE=256K */
+#define SMFIP_MDS_1M	0x20000000L	/* MILTER_MAX_DATA_SIZE=1M */
+/* #define SMFIP_	0x40000000L	reserved: see SMFI_INTERNAL*/
 
 #define SMFI_V1_PROT	0x0000003FL	/* The protocol of V1 filter */
 #define SMFI_V2_PROT	0x0000007FL	/* The protocol of V2 filter */
@@ -107,4 +116,11 @@
 /* all defined protocol bits */
 #define SMFI_CURR_PROT	0x001FFFFFL
 
+/* internal flags: only used between MTA and libmilter */
+#define SMFI_INTERNAL	0x70000000L
+
+#if _FFR_MILTER_CHECK
+# define SMFIP_TEST	0x80000000L
+#endif /* _FFR_MILTER_CHECK */
+
 #endif /* !_LIBMILTER_MFDEF_H */
diff --git a/include/sm/conf.h b/include/sm/conf.h
index 13b3b50cafc3..5b1875426af2 100644
--- a/include/sm/conf.h
+++ b/include/sm/conf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2009 Sendmail, Inc. and its suppliers.
  *	All rights reserved.
  * Copyright (c) 1983, 1995-1997 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
@@ -10,7 +10,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: conf.h,v 1.134 2007/09/24 23:05:37 ca Exp $
+ *	$Id: conf.h,v 1.139 2009/06/16 23:41:32 ca Exp $
  */
 
 /*
@@ -460,6 +460,7 @@ typedef int		pid_t;
 #   endif /* SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210) */
 #   if SOLARIS >= 21100 || (SOLARIS < 10000 && SOLARIS >= 211)
 #    define GETLDAPALIASBYNAME_VERSION 2	/* changed in S11 */
+#    define HAVE_NANOSLEEP	1	/* moved from librt to libc in S11 */
 #   endif /* SOLARIS >= 21100 || (SOLARIS < 10000 && SOLARIS >= 211) */
 #   ifndef HASGETUSERSHELL
 #    define HASGETUSERSHELL 0	/* getusershell(3) causes core dumps pre-2.7 */
@@ -1021,6 +1022,10 @@ extern unsigned int sleepX __P((unsigned int seconds));
 #      define SMRSH_PATH	"/bin:/usr/bin"
 #     endif /* ! SMRSH_PATH */
 #    endif /* __FreeBSD_version >= 330000 */
+#    if __FreeBSD_version >= 430000	/* 4.3.0-release and later */
+#     define SOCKADDR_LEN_T	socklen_t	/* e.g., arg#3 to accept, getsockname */
+#     define SOCKOPT_LEN_T	socklen_t	/* arg#5 to getsockopt */
+#    endif /* __FreeBSD_version >= 430000 */
 #    define USESYSCTL		1	/* use sysctl(3) for getting ncpus */
 #    include <sys/sysctl.h>
 #   endif /* __FreeBSD__ >= 2 */
@@ -2800,6 +2805,20 @@ struct utsname
 #  define MAXHOSTNAMELEN	256
 # endif /* !defined(MAXHOSTNAMELEN) && !defined(_SCO_unix_) && !defined(NonStop_UX_BXX) && !defined(ALTOS_SYSTEM_V) */
 
+
+# if _FFR_LINUX_MHNL && defined(__linux__) && MAXHOSTNAMELEN < 255
+   /*
+   **  override Linux wierdness: a FQHN can be 255 chars long
+   **  SUSv3 requires HOST_NAME_MAX ("Maximum length of a host
+   **  name (not including the terminating null) as returned from the
+   **  gethostname() function.") to be at least 255.  c.f.:
+   **  http://www.opengroup.org/onlinepubs/009695399
+   **  but Linux defines that to 64 too.
+   */
+#  undef MAXHOSTNAMELEN
+#  define MAXHOSTNAMELEN	256
+# endif /* _FFR_LINUX_MHNL && defined(__linux__) && MAXHOSTNAMELEN < 255 */
+
 # if !defined(SIGCHLD) && defined(SIGCLD)
 #  define SIGCHLD	SIGCLD
 # endif /* !defined(SIGCHLD) && defined(SIGCLD) */
diff --git a/include/sm/ldap.h b/include/sm/ldap.h
index fc9a325feef9..b0a9cc058044 100644
--- a/include/sm/ldap.h
+++ b/include/sm/ldap.h
@@ -6,7 +6,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: ldap.h,v 1.33 2007/10/10 00:06:44 ca Exp $
+ *	$Id: ldap.h,v 1.34 2008/11/17 21:02:54 ca Exp $
  */
 
 #ifndef	SM_LDAP_H
@@ -92,7 +92,7 @@ struct sm_ldap_struct
 	char		ldap_attrsep;
 
 # if _FFR_LDAP_NETWORK_TIMEOUT
-	struct timeval	ldap_networktmo;
+	int		ldap_networktmo;
 # endif /* _FFR_LDAP_NETWORK_TIMEOUT */
 
 	/* Linked list of maps sharing the same LDAP binding */
diff --git a/include/sm/sem.h b/include/sm/sem.h
index 7b691a43adc5..3ac0bc61cc3c 100644
--- a/include/sm/sem.h
+++ b/include/sm/sem.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2000-2001, 2005 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2005, 2008 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: sem.h,v 1.9 2005/02/17 22:08:58 ca Exp $
+ *	$Id: sem.h,v 1.10 2008/05/30 16:26:39 ca Exp $
  */
 
 #ifndef SM_SEM_H
@@ -47,6 +47,7 @@ extern int sm_sem_stop __P((int));
 extern int sm_sem_acq __P((int, int, int));
 extern int sm_sem_rel __P((int, int, int));
 extern int sm_sem_get __P((int, int));
+extern int sm_semsetowner __P((int, uid_t, gid_t, mode_t));
 
 # else /* SM_CONF_SEM > 0 */
 #  define sm_sem_start(key, nsem, semflg, owner) 0