From a2b986fa722f9860a6c56bb5cc724b7e2937d1b7 Mon Sep 17 00:00:00 2001
From: gshapiro <gshapiro@FreeBSD.org>
Date: Mon, 5 Nov 2007 00:04:21 +0000
Subject: Import sendmail 8.14.2

---
 contrib/sendmail/include/sm/conf.h  | 5 ++++-
 contrib/sendmail/include/sm/ldap.h  | 8 ++++++--
 contrib/sendmail/include/sm/tailq.h | 4 ++++
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'contrib/sendmail/include')

diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h
index 4f05f33..13b3b50 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.132 2007/03/21 23:56:18 ca Exp $
+ *	$Id: conf.h,v 1.134 2007/09/24 23:05:37 ca Exp $
  */
 
 /*
@@ -458,6 +458,9 @@ typedef int		pid_t;
 #   if SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210)
 #    define HASUNSETENV 1       /* unsetenv() added in S10 */
 #   endif /* SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210) */
+#   if SOLARIS >= 21100 || (SOLARIS < 10000 && SOLARIS >= 211)
+#    define GETLDAPALIASBYNAME_VERSION 2	/* changed in S11 */
+#   endif /* SOLARIS >= 21100 || (SOLARIS < 10000 && SOLARIS >= 211) */
 #   ifndef HASGETUSERSHELL
 #    define HASGETUSERSHELL 0	/* getusershell(3) causes core dumps pre-2.7 */
 #   endif /* ! HASGETUSERSHELL */
diff --git a/contrib/sendmail/include/sm/ldap.h b/contrib/sendmail/include/sm/ldap.h
index 63292f1..fc9a325 100644
--- a/contrib/sendmail/include/sm/ldap.h
+++ b/contrib/sendmail/include/sm/ldap.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2001-2003, 2005, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2003, 2005-2007 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: ldap.h,v 1.32 2006/08/30 22:56:58 ca Exp $
+ *	$Id: ldap.h,v 1.33 2007/10/10 00:06:44 ca Exp $
  */
 
 #ifndef	SM_LDAP_H
@@ -91,6 +91,10 @@ struct sm_ldap_struct
 	/* ldapmap_lookup options */
 	char		ldap_attrsep;
 
+# if _FFR_LDAP_NETWORK_TIMEOUT
+	struct timeval	ldap_networktmo;
+# endif /* _FFR_LDAP_NETWORK_TIMEOUT */
+
 	/* Linked list of maps sharing the same LDAP binding */
 	void		*ldap_next;
 };
diff --git a/contrib/sendmail/include/sm/tailq.h b/contrib/sendmail/include/sm/tailq.h
index cfb09be..c8eeec4 100644
--- a/contrib/sendmail/include/sm/tailq.h
+++ b/contrib/sendmail/include/sm/tailq.h
@@ -36,8 +36,12 @@
 #define	SM_TAILQ_H_
 
 /*
+ * $Id: tailq.h,v 1.2 2007/06/29 23:09:57 ca Exp $
+ *
  * This file is a modified copy of queue.h from a BSD system:
  * we only need tail queues here.
+ * We do not use queue.h directly because there is a conflict with
+ * some versions of that file on some OSs.
  *
  * A tail queue is headed by a pair of pointers, one to the head of the
  * list and the other to the tail of the list. The elements are doubly
-- 
cgit v1.1