diff options
Diffstat (limited to 'usr/src/cmd/sendmail/include')
| -rw-r--r-- | usr/src/cmd/sendmail/include/libmilter/mfdef.h | 6 | ||||
| -rw-r--r-- | usr/src/cmd/sendmail/include/sm/conf.h | 82 | ||||
| -rw-r--r-- | usr/src/cmd/sendmail/include/sm/errstring.h | 6 |
3 files changed, 64 insertions, 30 deletions
diff --git a/usr/src/cmd/sendmail/include/libmilter/mfdef.h b/usr/src/cmd/sendmail/include/libmilter/mfdef.h index 36da896b1f..969d238a7b 100644 --- a/usr/src/cmd/sendmail/include/libmilter/mfdef.h +++ b/usr/src/cmd/sendmail/include/libmilter/mfdef.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2007 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. * * - * $Id: mfdef.h,v 8.36 2006/11/28 18:31:00 ca Exp $ + * $Id: mfdef.h,v 8.38 2007/03/27 18:53:48 ca Exp $ */ /* @@ -36,7 +36,7 @@ extern "C" { /* 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 */ -#define SMFI_CURR_ACTS 0x000000FFL /* actions of current version */ +#define SMFI_CURR_ACTS 0x000001FFL /* actions of current version */ /* address families */ #define SMFIA_UNKNOWN 'U' /* unknown */ diff --git a/usr/src/cmd/sendmail/include/sm/conf.h b/usr/src/cmd/sendmail/include/sm/conf.h index 099ef03868..7c65586f2c 100644 --- a/usr/src/cmd/sendmail/include/sm/conf.h +++ b/usr/src/cmd/sendmail/include/sm/conf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2007 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.130 2006/08/17 21:15:07 ca Exp $ + * $Id: conf.h,v 1.132 2007/03/21 23:56:18 ca Exp $ */ /* @@ -169,6 +169,8 @@ extern void hard_syslog(); */ # ifdef _AIX5 +# include <sys/signal.h> +# include <sys/wait.h> # define _AIX4 40300 # define SOCKADDR_LEN_T socklen_t /* e.g., arg#3 to accept, getsockname */ # define SOCKOPT_LEN_T socklen_t /* arg#5 to getsockopt */ @@ -862,36 +864,64 @@ extern unsigned int sleepX __P((unsigned int seconds)); # endif /* __bsdi__ */ +# if defined(__QNX__) +# if defined(__QNXNTO__) +/* QNX 6 */ +# include <unix.h> +# define HASUNSETENV 1 /* has unsetenv(3) call */ +# define HASINITGROUPS 1 /* has initgroups(3) call */ +# define HASSETSID 1 /* has POSIX setsid(2) call */ +# define USESETEUID 1 /* has usable seteuid(2) call */ +# define HASFCHMOD 1 /* has fchmod(2) syscall */ +# define HASFCHOWN 1 /* has fchown(2) syscall */ +# define HASUNAME 1 /* has uname(2) syscall */ +# define HASSTRERROR 1 /* has strerror(3) */ +# define BSD4_4_SOCKADDR /* has sa_len */ +# define ERRLIST_PREDEFINED /* don't declare sys_errlist */ +# define NETLINK 1 /* supports AF_LINK */ +# define GIDSET_T gid_t +# define QUAD_T uint64_t +# define HASSNPRINTF 1 /* has snprintf(3) (all versions?) */ +# define HASGETUSERSHELL 0 + +/* +** We have a strrev() that doesn't allocate anything. +** Make sure the one here is used. +*/ + +# define strrev strrev_sendmail + +# else /* defined(__QNXNTO__) */ + /* ** QNX 4.2x ** Contributed by Glen McCready <glen@qnx.com>. ** -** Should work with all versions of QNX. +** Should work with all versions of QNX 4. */ -# if defined(__QNX__) -# include <unix.h> -# include <sys/select.h> -# undef NGROUPS_MAX -# define HASSETSID 1 /* has POSIX setsid(2) call */ -# define USESETEUID 1 /* has usable seteuid(2) call */ -# define HASFCHMOD 1 /* has fchmod(2) syscall */ -# define HASGETDTABLESIZE 1 /* has getdtablesize(2) call */ -# define HASSETREUID 1 /* has setreuid(2) call */ -# define HASSTRERROR 1 /* has strerror(3) */ -# define HASFLOCK 0 -# undef HASINITGROUPS /* has initgroups(3) call */ -# define SM_CONF_GETOPT 0 /* need a replacement for getopt(3) */ -# define IP_SRCROUTE 1 /* can check IP source routing */ -# define TZ_TYPE TZ_TMNAME /* use tmname variable */ -# define GIDSET_T gid_t -# define LA_TYPE LA_ZERO -# define SFS_TYPE SFS_NONE -# define SPT_TYPE SPT_REUSEARGV -# define SPT_PADCHAR '\0' /* pad process title with nulls */ -# define HASGETUSERSHELL 0 -# define E_PSEUDOBASE 512 -# define _FILE_H_INCLUDED +# include <unix.h> +# include <sys/select.h> +# undef NGROUPS_MAX +# define HASSETSID 1 /* has POSIX setsid(2) call */ +# define USESETEUID 1 /* has usable seteuid(2) call */ +# define HASFCHMOD 1 /* has fchmod(2) syscall */ +# define HASGETDTABLESIZE 1 /* has getdtablesize(2) call */ +# define HASSETREUID 1 /* has setreuid(2) call */ +# define HASSTRERROR 1 /* has strerror(3) */ +# define HASFLOCK 0 +# undef HASINITGROUPS /* has initgroups(3) call */ +# define SM_CONF_GETOPT 0 /* need a replacement for getopt(3) */ +# define IP_SRCROUTE 1 /* can check IP source routing */ +# define TZ_TYPE TZ_TMNAME /* use tmname variable */ +# define GIDSET_T gid_t +# define LA_TYPE LA_ZERO +# define SFS_TYPE SFS_NONE +# define SPT_TYPE SPT_REUSEARGV +# define SPT_PADCHAR '\0' /* pad process title with nulls */ +# define HASGETUSERSHELL 0 +# define _FILE_H_INCLUDED +# endif /* defined(__QNXNTO__) */ # endif /* defined(__QNX__) */ diff --git a/usr/src/cmd/sendmail/include/sm/errstring.h b/usr/src/cmd/sendmail/include/sm/errstring.h index bfb2b2f096..2fbd4ecd06 100644 --- a/usr/src/cmd/sendmail/include/sm/errstring.h +++ b/usr/src/cmd/sendmail/include/sm/errstring.h @@ -6,7 +6,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: errstring.h,v 1.9 2003/12/10 03:19:06 gshapiro Exp $ + * $Id: errstring.h,v 1.10 2007/03/21 23:56:19 ca Exp $ */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -18,6 +18,10 @@ #ifndef SM_ERRSTRING_H # define SM_ERRSTRING_H +#if defined(__QNX__) +# define E_PSEUDOBASE 512 +#endif /* defined(__QNX__) */ + #include <errno.h> #if NEEDINTERRNO extern int errno; |