diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2003-02-08 20:31:29 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2003-02-08 20:31:29 +0000 |
commit | 842b56b9cabf175e7842ec5a3b29ff68353b3177 (patch) | |
tree | 2e81c43d391ed220f6656502de14ddfbb0de4ecd /contrib/sendmail/libsmdb/smdb2.c | |
parent | 39e311b2e17a53f7ed02fcbe3820ca77b65486d5 (diff) | |
download | FreeBSD-src-842b56b9cabf175e7842ec5a3b29ff68353b3177.zip FreeBSD-src-842b56b9cabf175e7842ec5a3b29ff68353b3177.tar.gz |
Import sendmail 8.12.7
Diffstat (limited to 'contrib/sendmail/libsmdb/smdb2.c')
-rw-r--r-- | contrib/sendmail/libsmdb/smdb2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/sendmail/libsmdb/smdb2.c b/contrib/sendmail/libsmdb/smdb2.c index 9e2e8ed..1ccff5d 100644 --- a/contrib/sendmail/libsmdb/smdb2.c +++ b/contrib/sendmail/libsmdb/smdb2.c @@ -8,7 +8,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: smdb2.c,v 8.72 2002/05/24 23:09:11 gshapiro Exp $") +SM_RCSID("@(#)$Id: smdb2.c,v 8.72.2.4 2002/12/03 17:01:15 ca Exp $") #include <fcntl.h> #include <stdlib.h> @@ -523,7 +523,9 @@ smdb_db_open_internal(db_name, db_type, db_flags, db_params, db) } } - result = (*db)->open(*db, db_name, NULL, db_type, db_flags, DBMMODE); + result = (*db)->open(*db, + DBTXN /* transaction for DB 4.1 */ + db_name, NULL, db_type, db_flags, DBMMODE); if (result != 0) { (void) (*db)->close(*db, 0); @@ -633,9 +635,7 @@ smdb_db_open(database, db_name, mode, mode_mask, sff, type, user_info, db_params db_flags |= DB_TRUNCATE; if (mode == O_RDONLY) db_flags |= DB_RDONLY; -# if !HASFLOCK && defined(DB_FCNTL_LOCKING) - db_flags |= DB_FCNTL_LOCKING; -# endif /* !HASFLOCK && defined(DB_FCNTL_LOCKING) */ + SM_DB_FLAG_ADD(db_flags); result = smdb_db_open_internal(db_file_name, db_type, db_flags, db_params, &db); |