From 1db32f703cfcf30cbc248b3abe88b62560096209 Mon Sep 17 00:00:00 2001 From: "relyea%netscape.com" Date: Tue, 18 Jun 2002 16:41:41 +0000 Subject: 1) Map flags both coming and going. 2) Finish transaction of the target database not the source database. --- security/nss/lib/softoken/dbinit.c | 2 +- security/nss/lib/softoken/keydb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'security/nss/lib') diff --git a/security/nss/lib/softoken/dbinit.c b/security/nss/lib/softoken/dbinit.c index 5a85df40c..3b690bd02 100644 --- a/security/nss/lib/softoken/dbinit.c +++ b/security/nss/lib/softoken/dbinit.c @@ -269,7 +269,7 @@ DB * rdbopen(const char *appName, const char *prefix, DB *db; if (pk11_rdbfunc) { - db = (*pk11_rdbfunc)(appName,prefix,type,flags); + db = (*pk11_rdbfunc)(appName,prefix,type,rdbmapflags(flags)); return db; } diff --git a/security/nss/lib/softoken/keydb.c b/security/nss/lib/softoken/keydb.c index f135d19d2..47c6a4c8b 100644 --- a/security/nss/lib/softoken/keydb.c +++ b/security/nss/lib/softoken/keydb.c @@ -877,7 +877,7 @@ openNewDB(const char *appName, const char *prefix, const char *dbname, } else { db_Copy(handle->db, updatedb); (updatedb->close)(updatedb); - db_FinishTransaction(updatedb,PR_FALSE); + db_FinishTransaction(handle->db,PR_FALSE); return SECSuccess; } } -- cgit v1.2.1