diff options
Diffstat (limited to 'contrib/sendmail/include')
| -rw-r--r-- | contrib/sendmail/include/libmilter/mfapi.h | 4 | ||||
| -rw-r--r-- | contrib/sendmail/include/sm/clock.h | 9 | ||||
| -rw-r--r-- | contrib/sendmail/include/sm/conf.h | 27 | ||||
| -rw-r--r-- | contrib/sendmail/include/sm/config.h | 3 | ||||
| -rw-r--r-- | contrib/sendmail/include/sm/os/sm_os_dragonfly.h | 33 |
5 files changed, 62 insertions, 14 deletions
diff --git a/contrib/sendmail/include/libmilter/mfapi.h b/contrib/sendmail/include/libmilter/mfapi.h index b226a1a..d4a02f9 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.59 2004/07/07 21:41:31 ca Exp $ + * $Id: mfapi.h,v 8.60 2004/08/20 21:24:14 ca Exp $ */ /* @@ -425,7 +425,6 @@ LIBMILTER_API int smfi_addrcpt __P((SMFICTX *, char *)); LIBMILTER_API int smfi_delrcpt __P((SMFICTX *, char *)); -#if _FFR_SMFI_PROGRESS /* ** Send a "no-op" up to the MTA to tell it we're still alive, so long ** milter-side operations don't time out. @@ -434,7 +433,6 @@ LIBMILTER_API int smfi_delrcpt __P((SMFICTX *, char *)); */ LIBMILTER_API int smfi_progress __P((SMFICTX *)); -#endif /* _FFR_SMFI_PROGRESS */ /* ** Delete a recipient from the envelope diff --git a/contrib/sendmail/include/sm/clock.h b/contrib/sendmail/include/sm/clock.h index b0dfb43..ba7fd68 100644 --- a/contrib/sendmail/include/sm/clock.h +++ b/contrib/sendmail/include/sm/clock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2001, 2004 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -9,7 +9,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: clock.h,v 1.11 2001/05/14 23:25:37 gshapiro Exp $ + * $Id: clock.h,v 1.12 2004/08/03 19:57:21 ca Exp $ */ /* @@ -52,9 +52,8 @@ typedef struct sm_event SM_EVENT; /* functions */ extern void sm_clrevent __P((SM_EVENT *)); extern void sm_clear_events __P((void)); -extern SM_EVENT *sm_setevent __P((time_t, void(*)(), int)); -extern SM_EVENT *sm_seteventm __P((int, void(*)(), int)); -extern SM_EVENT *sm_sigsafe_seteventm __P((int, void(*)(), int)); +extern SM_EVENT *sm_seteventm __P((int, void(*)__P((int)), int)); +extern SM_EVENT *sm_sigsafe_seteventm __P((int, void(*)__P((int)), int)); extern SIGFUNC_DECL sm_tick __P((int)); /* diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h index 355d427..fa3801e 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.116 2004/07/26 18:08:35 ca Exp $ + * $Id: conf.h,v 1.118 2004/08/20 20:30:32 ca Exp $ */ /* @@ -866,7 +866,7 @@ extern unsigned int sleepX __P((unsigned int seconds)); /* -** FreeBSD / NetBSD / OpenBSD (all architectures, all versions) +** DragonFly BSD/ FreeBSD / NetBSD / OpenBSD (all architectures, all versions) ** ** 4.3BSD clone, closer to 4.4BSD for FreeBSD 1.x and NetBSD 0.9x ** 4.4BSD-Lite based for FreeBSD 2.x and NetBSD 1.x @@ -874,7 +874,7 @@ extern unsigned int sleepX __P((unsigned int seconds)); ** See also BSD defines. */ -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) # include <paths.h> # define HASUNSETENV 1 /* has unsetenv(3) call */ # define HASSETSID 1 /* has POSIX setsid(2) call */ @@ -919,6 +919,23 @@ extern unsigned int sleepX __P((unsigned int seconds)); # include <sys/param.h> # include <sys/sysctl.h> # endif +# if defined(__DragonFly__) +# define HASSETLOGIN 1 /* has setlogin(2) */ +# define HASSRANDOMDEV 1 /* has srandomdev(3) */ +# define HASURANDOMDEV 1 /* has /dev/urandom(4) */ +# undef SPT_TYPE +# include <libutil.h> +# define SPT_TYPE SPT_BUILTIN +# define HASSETUSERCONTEXT 1 /* BSDI-style login classes */ +# 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 */ +# define USESYSCTL 1 /* use sysctl(3) for getting ncpus */ +# include <sys/sysctl.h> +# endif /* defined(__DragonFly__) */ # if defined(__FreeBSD__) # define HASSETLOGIN 1 /* has setlogin(2) */ # if __FreeBSD_version >= 227001 @@ -970,7 +987,7 @@ extern unsigned int sleepX __P((unsigned int seconds)); # define HASCLOSEFROM 1 /* closefrom(3) added in 3.5 */ # endif /* OpenBSD >= 200405 */ # endif /* defined(__OpenBSD__) */ -# endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) */ +# endif /* defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) */ /* @@ -2924,7 +2941,7 @@ struct sm_align long al_l; void *al_p; double al_d; - void (*al_f)(); + void (*al_f) __P((void)); } al_u; }; # define SM_ALIGN_SIZE offsetof(struct sm_align, al_u) diff --git a/contrib/sendmail/include/sm/config.h b/contrib/sendmail/include/sm/config.h index 3e4a912..5ebe548 100644 --- a/contrib/sendmail/include/sm/config.h +++ b/contrib/sendmail/include/sm/config.h @@ -6,7 +6,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: config.h,v 1.46 2003/12/10 03:19:06 gshapiro Exp $ + * $Id: config.h,v 1.47 2004/10/26 21:41:07 gshapiro Exp $ */ /* @@ -145,6 +145,7 @@ /* LDAP Checks */ # if LDAPMAP +# include <lber.h> # include <ldap.h> /* Does the LDAP library have ldap_memfree()? */ diff --git a/contrib/sendmail/include/sm/os/sm_os_dragonfly.h b/contrib/sendmail/include/sm/os/sm_os_dragonfly.h new file mode 100644 index 0000000..4428cab --- /dev/null +++ b/contrib/sendmail/include/sm/os/sm_os_dragonfly.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2000-2001, 2004 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_dragonfly.h,v 1.1 2004/08/06 03:54:07 gshapiro Exp $ + */ + +/* +** Platform definitions for DragonFly BSD +*/ + +#define SM_OS_NAME "dragonfly" + +#define SM_CONF_SYS_CDEFS_H 1 + +#define MI_SOMAXCONN -1 /* listen() max backlog for milter */ + +#ifndef SM_CONF_STRL +# define SM_CONF_STRL 1 +#endif /* SM_CONF_STRL */ +#ifndef SM_CONF_SHM +# define SM_CONF_SHM 1 +#endif /* SM_CONF_SHM */ +#ifndef SM_CONF_SEM +# define SM_CONF_SEM 1 +#endif /* SM_CONF_SEM */ +#ifndef SM_CONF_MSG +# define SM_CONF_MSG 1 +#endif /* SM_CONF_MSG */ |
