diff options
Diffstat (limited to 'include/sm')
| -rw-r--r-- | include/sm/bdb.h | 8 | ||||
| -rw-r--r-- | include/sm/cdefs.h | 6 | ||||
| -rw-r--r-- | include/sm/conf.h | 8 | ||||
| -rw-r--r-- | include/sm/errstring.h | 12 | ||||
| -rw-r--r-- | include/sm/fdset.h | 8 |
5 files changed, 29 insertions, 13 deletions
diff --git a/include/sm/bdb.h b/include/sm/bdb.h index a8a977a829477..893d815229fe9 100644 --- a/include/sm/bdb.h +++ b/include/sm/bdb.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003 Proofpoint, Inc. and its suppliers. + * Copyright (c) 2002, 2003, 2014 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -19,7 +19,7 @@ # define DB_VERSION_MAJOR 1 # endif /* ! DB_VERSION_MAJOR */ -# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 +# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 # define DBTXN NULL , @@ -32,7 +32,7 @@ # define SM_DB_FLAG_ADD(flag) (flag) |= DB_FCNTL_LOCKING -# else /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */ +# else /* (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 */ # define DBTXN # if !HASFLOCK && defined(DB_FCNTL_LOCKING) @@ -41,7 +41,7 @@ # define SM_DB_FLAG_ADD(flag) ((void) 0) # endif /* !HASFLOCK && defined(DB_FCNTL_LOCKING) */ -# endif /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */ +# endif /* (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 */ #endif /* NEWDB */ #endif /* ! SM_BDB_H */ diff --git a/include/sm/cdefs.h b/include/sm/cdefs.h index d288aa0f71cf7..0802d5941c977 100644 --- a/include/sm/cdefs.h +++ b/include/sm/cdefs.h @@ -121,11 +121,11 @@ */ # ifndef SM_CONF_FORMAT_TEST -# if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 +# if (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) || __GNUC__ > 2 # define SM_CONF_FORMAT_TEST 1 -# else /* __GNUC__ == 2 && __GNUC_MINOR__ >= 7 */ +# else # define SM_CONF_FORMAT_TEST 0 -# endif /* __GNUC__ == 2 && __GNUC_MINOR__ >= 7 */ +# endif # endif /* SM_CONF_FORMAT_TEST */ # ifndef PRINTFLIKE diff --git a/include/sm/conf.h b/include/sm/conf.h index bea380aad4941..f43b4fe699e75 100644 --- a/include/sm/conf.h +++ b/include/sm/conf.h @@ -473,6 +473,9 @@ typedef int pid_t; # ifndef HASGETUSERSHELL # define HASGETUSERSHELL 0 /* getusershell(3) causes core dumps pre-2.7 */ # endif /* ! HASGETUSERSHELL */ +# if SOLARIS < 21200 +# define SIGWAIT_TAKES_1_ARG 1 /* S12 moves to UNIX V7 semantic */ +# endif /* SOLARIS < 21200 */ # else /* SOLARIS */ /* SunOS 4.0.3 or 4.1.x */ @@ -1906,6 +1909,7 @@ extern struct passwd * sendmail_mpe_getpwuid __P((uid_t)); # define GIDSET_T gid_t # define SOCKADDR_LEN_T size_t # define SOCKOPT_LEN_T size_t +# define SIGWAIT_TAKES_1_ARG 1 # ifndef _PATH_UNIX # define _PATH_UNIX "/stand/unix" # endif /* ! _PATH_UNIX */ @@ -2920,6 +2924,10 @@ typedef void (*sigfunc_t) __P((int)); # define FD_SETSIZE 256 #endif /* ! FD_SETSIZE */ +#ifndef SIGWAIT_TAKES_1_ARG +# define SIGWAIT_TAKES_1_ARG 0 +#endif /* ! SIGWAIT_TAKES_1_ARG */ + /* ** Size of prescan buffer. ** Despite comments in the _sendmail_ book, this probably should diff --git a/include/sm/errstring.h b/include/sm/errstring.h index 836fe14f70c45..14c100773202b 100644 --- a/include/sm/errstring.h +++ b/include/sm/errstring.h @@ -49,9 +49,17 @@ extern int errno; #define E_SM_WRFILE (E_PSEUDOBASE + 11) /* o readable file */ #define E_DNSBASE (E_PSEUDOBASE + 20) /* base for DNS h_errno */ #define E_SMDBBASE (E_PSEUDOBASE + 40) /* base for libsmdb errors */ -#define E_LDAPBASE (E_PSEUDOBASE + 70) /* base for LDAP errors */ -#define E_LDAPURLBASE (E_PSEUDOBASE + 200) /* base for LDAP URL errors */ +#define E_LDAPREALBASE (E_PSEUDOBASE + 70) /* start of range for LDAP */ +#define E_LDAPBASE (E_LDAPREALBASE + E_LDAP_SHIM) /* LDAP error zero */ +#define E_LDAPURLBASE (E_PSEUDOBASE + 230) /* base for LDAP URL errors */ +/* +** OpenLDAP uses small negative errors for internal (non-protocol) +** errors. We expect them to be between zero and -E_LDAP_SHIM +** (and then offset by E_LDAPBASE). +*/ + +#define E_LDAP_SHIM 30 /* libsmdb */ #define SMDBE_OK 0 diff --git a/include/sm/fdset.h b/include/sm/fdset.h index 8a5a1d4db453a..b4a1e7dec87b9 100644 --- a/include/sm/fdset.h +++ b/include/sm/fdset.h @@ -17,9 +17,9 @@ ** before. */ -# define SM_FD_SET(fd, pfdset) FD_SET(fd, pfdset) -# define SM_FD_ISSET(fd, pfdset) FD_ISSET(fd, pfdset) -# define SM_FD_SETSIZE FD_SETSIZE -# define SM_FD_OK_SELECT(fd) (FD_SETSIZE <= 0 || (fd) < FD_SETSIZE) +#define SM_FD_SET(fd, pfdset) FD_SET(fd, pfdset) +#define SM_FD_ISSET(fd, pfdset) FD_ISSET(fd, pfdset) +#define SM_FD_SETSIZE FD_SETSIZE +#define SM_FD_OK_SELECT(fd) (SM_FD_SETSIZE <= 0 || (fd) < SM_FD_SETSIZE) #endif /* SM_FDSET_H */ |