summaryrefslogtreecommitdiff
path: root/security/nss/lib
diff options
context:
space:
mode:
authorrelyea%netscape.com <devnull@localhost>2002-06-18 16:41:41 +0000
committerrelyea%netscape.com <devnull@localhost>2002-06-18 16:41:41 +0000
commit1db32f703cfcf30cbc248b3abe88b62560096209 (patch)
tree63728552b3b113bed1926d5a9b57c50541e3fada /security/nss/lib
parent8cb87c3de818519e4c15ac4129730370769d26af (diff)
downloadnss-hg-1db32f703cfcf30cbc248b3abe88b62560096209.tar.gz
1) Map flags both coming and going.
2) Finish transaction of the target database not the source database.
Diffstat (limited to 'security/nss/lib')
-rw-r--r--security/nss/lib/softoken/dbinit.c2
-rw-r--r--security/nss/lib/softoken/keydb.c2
2 files changed, 2 insertions, 2 deletions
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;
}
}