diff options
Diffstat (limited to 'gnu/usr.sbin/sendmail/include')
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/libmilter/mfapi.h | 6 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/sm/conf.h | 5 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/sm/ldap.h | 8 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/sm/tailq.h | 6 |
4 files changed, 18 insertions, 7 deletions
diff --git a/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h b/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h index 1654d6280d0..06717365228 100644 --- a/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h +++ b/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006, 2008 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -7,7 +7,7 @@ * the sendmail distribution. * * - * $Sendmail: mfapi.h,v 8.77 2006/11/02 02:44:07 ca Exp $ + * $Sendmail: mfapi.h,v 8.78 2008/02/27 22:30:34 ca Exp $ */ /* @@ -18,7 +18,7 @@ # define _LIBMILTER_MFAPI_H 1 #ifndef SMFI_VERSION -# define SMFI_VERSION 0x01000000 /* libmilter version number */ +# define SMFI_VERSION 0x01000001 /* libmilter version number */ #endif /* ! SMFI_VERSION */ #define SM_LM_VRS_MAJOR(v) (((v) & 0x7f000000) >> 24) diff --git a/gnu/usr.sbin/sendmail/include/sm/conf.h b/gnu/usr.sbin/sendmail/include/sm/conf.h index 1b215c5c4f1..15b87552aed 100644 --- a/gnu/usr.sbin/sendmail/include/sm/conf.h +++ b/gnu/usr.sbin/sendmail/include/sm/conf.h @@ -10,7 +10,7 @@ * the sendmail distribution. * * - * $Sendmail: conf.h,v 1.132 2007/03/21 23:56:18 ca Exp $ + * $Sendmail: 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/gnu/usr.sbin/sendmail/include/sm/ldap.h b/gnu/usr.sbin/sendmail/include/sm/ldap.h index 5c7fb158c17..2be6fbf11b4 100644 --- a/gnu/usr.sbin/sendmail/include/sm/ldap.h +++ b/gnu/usr.sbin/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. * - * $Sendmail: ldap.h,v 1.32 2006/08/30 22:56:58 ca Exp $ + * $Sendmail: 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/gnu/usr.sbin/sendmail/include/sm/tailq.h b/gnu/usr.sbin/sendmail/include/sm/tailq.h index 41b8bd93cd0..cd1af7c56a3 100644 --- a/gnu/usr.sbin/sendmail/include/sm/tailq.h +++ b/gnu/usr.sbin/sendmail/include/sm/tailq.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tailq.h,v 1.1 2007/02/04 13:17:35 millert Exp $ */ +/* $OpenBSD: tailq.h,v 1.2 2008/05/04 18:34:04 millert Exp $ */ /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ /* @@ -36,8 +36,12 @@ #define SM_TAILQ_H_ /* + * $Sendmail: 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 |