1) Map flags both coming and going.

2) Finish transaction of the target database not the source database.

security/nss/lib/softoken/dbinit.c

@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- # $Id: dbinit.c,v 1.13 2002/06/17 18:46:27 relyea%netscape.com Exp $
+ # $Id: dbinit.c,v 1.14 2002/06/18 16:41:41 relyea%netscape.com Exp $
  */
 
 #include <ctype.h>
@@ -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;
     }
 

security/nss/lib/softoken/keydb.c

@@ -32,7 +32,7 @@
  *
  * Private Key Database code
  *
- * $Id: keydb.c,v 1.22 2002/06/14 17:29:56 relyea%netscape.com Exp $
+ * $Id: keydb.c,v 1.23 2002/06/18 16:41:41 relyea%netscape.com Exp $
  */
 
 #include "lowkeyi.h"
@@ -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;
 	    }
 	}