diff options
Diffstat (limited to 'gnu/usr.sbin/sendmail/include')
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/libmilter/mfapi.h | 5 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/libsmdb/smdb.h | 5 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/sendmail/pathnames.h | 4 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/sm/conf.h | 9 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/sm/mbdb.h | 8 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/sm/os/sm_os_freebsd.h | 8 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/include/sm/shm.h | 7 |
7 files changed, 24 insertions, 22 deletions
diff --git a/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h b/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h index 5a6fa5a5044..2c9df203497 100644 --- a/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h +++ b/gnu/usr.sbin/sendmail/include/libmilter/mfapi.h @@ -7,7 +7,7 @@ * the sendmail distribution. * * - * $Sendmail: mfapi.h,v 8.41 2002/03/22 21:36:12 gshapiro Exp $ + * $Sendmail: mfapi.h,v 8.42 2002/04/30 23:52:23 msk Exp $ */ /* @@ -106,6 +106,9 @@ struct smfiDesc sfsistat (*xxfi_close) SM__P((SMFICTX *)); }; +#if _FFR_SMFI_OPENSOCKET +LIBMILTER_API int smfi_opensocket __P((void)); +#endif /* _FFR_SMFI_OPENSOCKET */ LIBMILTER_API int smfi_register __P((struct smfiDesc)); LIBMILTER_API int smfi_main __P((void)); LIBMILTER_API int smfi_setbacklog __P((int)); diff --git a/gnu/usr.sbin/sendmail/include/libsmdb/smdb.h b/gnu/usr.sbin/sendmail/include/libsmdb/smdb.h index 488b1c94ab3..93abc1c0246 100644 --- a/gnu/usr.sbin/sendmail/include/libsmdb/smdb.h +++ b/gnu/usr.sbin/sendmail/include/libsmdb/smdb.h @@ -1,12 +1,12 @@ /* - * Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2002 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: smdb.h,v 8.38 2001/11/19 19:30:03 gshapiro Exp $ + * $Sendmail: smdb.h,v 8.40 2002/05/24 23:20:14 gshapiro Exp $ * */ @@ -34,7 +34,6 @@ */ #define SMDB_MAX_USER_NAME_LEN 1024 -#define SMDB_MAX_NAME_LEN 1024 /* ** This file defines the abstraction for database lookups. It is pretty diff --git a/gnu/usr.sbin/sendmail/include/sendmail/pathnames.h b/gnu/usr.sbin/sendmail/include/sendmail/pathnames.h index 361b4b7e4d2..66dfb31b5cc 100644 --- a/gnu/usr.sbin/sendmail/include/sendmail/pathnames.h +++ b/gnu/usr.sbin/sendmail/include/sendmail/pathnames.h @@ -9,7 +9,7 @@ * the sendmail distribution. * * - * $Sendmail: pathnames.h,v 8.35 2001/03/23 22:09:44 ca Exp $ + * $Sendmail: pathnames.h,v 8.36 2002/04/09 22:40:26 gshapiro Exp $ */ #ifndef SM_PATHNAMES_H @@ -37,7 +37,7 @@ # endif /* ! _PATH_SENDMAIL */ # ifndef _PATH_MAILDIR -# define _PATH_MAILDIR "/var/spool/mail" +# define _PATH_MAILDIR "/var/spool/mail" # endif /* ! _PATH_MAILDIR */ # ifndef _PATH_LOCTMP diff --git a/gnu/usr.sbin/sendmail/include/sm/conf.h b/gnu/usr.sbin/sendmail/include/sm/conf.h index d6d5a6252a3..bf96ba93dde 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.87 2002/04/02 08:11:52 gshapiro Exp $ + * $Sendmail: conf.h,v 1.88 2002/05/01 16:09:41 gshapiro Exp $ */ /* @@ -609,7 +609,12 @@ extern long dgux_inet_addr(); # define GIDSET_T gid_t # define SM_INT32 int /* 32bit integer */ # ifndef HASFLOCK -# define HASFLOCK 1 /* has flock(2) call */ +# include <standards.h> +# if _XOPEN_SOURCE+0 >= 400 +# define HASFLOCK 0 /* 5.0 and later has bad flock(2) call */ +# else /* _XOPEN_SOURCE+0 >= 400 */ +# define HASFLOCK 1 /* has flock(2) call */ +# endif /* _XOPEN_SOURCE+0 >= 400 */ # endif /* ! HASFLOCK */ # define LA_TYPE LA_ALPHAOSF # define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */ diff --git a/gnu/usr.sbin/sendmail/include/sm/mbdb.h b/gnu/usr.sbin/sendmail/include/sm/mbdb.h index f25d85c713d..975b4b64482 100644 --- a/gnu/usr.sbin/sendmail/include/sm/mbdb.h +++ b/gnu/usr.sbin/sendmail/include/sm/mbdb.h @@ -1,12 +1,12 @@ /* - * Copyright (c) 2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001-2002 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: mbdb.h,v 1.4 2001/03/08 03:23:08 ca Exp $ + * $Sendmail: mbdb.h,v 1.6 2002/05/24 20:50:14 gshapiro Exp $ */ #ifndef SM_MBDB_H @@ -30,8 +30,8 @@ typedef struct gid_t mbdb_gid; char mbdb_name[MBDB_MAXNAME]; char mbdb_fullname[MBDB_MAXNAME]; - char mbdb_homedir[PATH_MAX + 1]; - char mbdb_shell[PATH_MAX + 1]; + char mbdb_homedir[PATH_MAX]; + char mbdb_shell[PATH_MAX]; } SM_MBDB_T; extern int sm_mbdb_initialize __P((char *)); diff --git a/gnu/usr.sbin/sendmail/include/sm/os/sm_os_freebsd.h b/gnu/usr.sbin/sendmail/include/sm/os/sm_os_freebsd.h index 282607773f2..994742448ae 100644 --- a/gnu/usr.sbin/sendmail/include/sm/os/sm_os_freebsd.h +++ b/gnu/usr.sbin/sendmail/include/sm/os/sm_os_freebsd.h @@ -6,7 +6,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Sendmail: sm_os_freebsd.h,v 1.10 2002/03/10 22:41:03 gshapiro Exp $ + * $Sendmail: sm_os_freebsd.h,v 1.11 2002/04/15 17:17:05 gshapiro Exp $ */ /* @@ -31,11 +31,7 @@ #endif #ifndef SM_CONF_SHM -# ifdef __sparc64__ -# define SM_CONF_SHM 0 -# else /* __sparc64__ */ -# define SM_CONF_SHM 1 -# endif /* __sparc64__ */ +# define SM_CONF_SHM 1 #endif /* SM_CONF_SHM */ #ifndef SM_CONF_SEM # define SM_CONF_SEM 1 diff --git a/gnu/usr.sbin/sendmail/include/sm/shm.h b/gnu/usr.sbin/sendmail/include/sm/shm.h index 6efbfbc57e6..7fdbbaf0e8b 100644 --- a/gnu/usr.sbin/sendmail/include/sm/shm.h +++ b/gnu/usr.sbin/sendmail/include/sm/shm.h @@ -1,12 +1,12 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002 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: shm.h,v 1.7 2001/04/20 15:21:55 ca Exp $ + * $Sendmail: shm.h,v 1.8 2002/04/10 23:11:35 ca Exp $ */ #ifndef SM_SHM_H @@ -24,8 +24,7 @@ /* return value for failed shmget() */ # define SM_SHM_NULL ((void *) -1) -# define SM_SHM_NO_ID (-1) -# define SM_NO_SHM(id) ((id) < 0) +# define SM_SHM_NO_ID (-2) extern void *sm_shmstart __P((key_t, int , int , int *, bool)); extern int sm_shmstop __P((void *, int, bool)); |