diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2003-03-29 19:12:53 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2003-03-29 19:12:53 +0000 |
commit | 3c5a1e863a66866807948f160122c79d2dd388f5 (patch) | |
tree | 386651c7612a011fa164c3c96d8196d02de68386 /contrib/sendmail/include/sm | |
parent | 8b739caa56202c57ac3a53e04d5b561d17b20b6c (diff) | |
download | FreeBSD-src-3c5a1e863a66866807948f160122c79d2dd388f5.zip FreeBSD-src-3c5a1e863a66866807948f160122c79d2dd388f5.tar.gz |
Import sendmail 8.12.9
Diffstat (limited to 'contrib/sendmail/include/sm')
-rw-r--r-- | contrib/sendmail/include/sm/bdb.h | 10 | ||||
-rw-r--r-- | contrib/sendmail/include/sm/conf.h | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/contrib/sendmail/include/sm/bdb.h b/contrib/sendmail/include/sm/bdb.h index 34b6f7b..453eaa7 100644 --- a/contrib/sendmail/include/sm/bdb.h +++ b/contrib/sendmail/include/sm/bdb.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 2002, 2003 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: bdb.h,v 1.1.2.3 2002/12/05 05:07:44 ca Exp $ + * $Id: bdb.h,v 1.1.2.4 2003/03/06 16:27:38 ca Exp $ */ #ifndef SM_BDB_H @@ -35,11 +35,11 @@ # else /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */ # define DBTXN -# if !HASFLOCK +# if !HASFLOCK && defined(DB_FCNTL_LOCKING) # define SM_DB_FLAG_ADD(flag) (flag) |= DB_FCNTL_LOCKING -# else /* !HASFLOCK */ +# else /* !HASFLOCK && defined(DB_FCNTL_LOCKING) */ # define SM_DB_FLAG_ADD(flag) ((void) 0) -# endif /* !HASFLOCK */ +# endif /* !HASFLOCK && defined(DB_FCNTL_LOCKING) */ # endif /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */ #endif /* NEWDB */ diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h index c76ab0f..b3863f1 100644 --- a/contrib/sendmail/include/sm/conf.h +++ b/contrib/sendmail/include/sm/conf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2003 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.90.2.13 2002/12/10 03:08:56 ca Exp $ + * $Id: conf.h,v 1.90.2.14 2003/03/06 18:38:06 ca Exp $ */ /* @@ -1326,6 +1326,7 @@ extern void *malloc(); # ifndef USESETEUID # define USESETEUID 0 /* has it due to POSIX, but doesn't work */ # endif /* USESETEUID */ +# define SM_CONF_GETOPT 0 /* need a replacement for getopt(3) */ # define HASUNAME 1 /* use System V uname(2) system call */ # define HASUNSETENV 1 /* has unsetenv(3) call */ # define ERRLIST_PREDEFINED /* don't declare sys_errlist */ |