From 81db56051e28b3e5a9ac93093f36efada1a79c4e Mon Sep 17 00:00:00 2001
From: "relyea%netscape.com" <relyea%netscape.com>
Date: Thu, 16 May 2002 20:48:27 +0000
Subject: [PATCH] Argh. I thought I had compiled this! fixe compile errors.

---
 security/nss/lib/softoken/dbinit.c  | 6 +++---
 security/nss/lib/softoken/pcertdb.c | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/security/nss/lib/softoken/dbinit.c b/security/nss/lib/softoken/dbinit.c
index 956f47dda6a0..8e1d15843ecd 100644
--- a/security/nss/lib/softoken/dbinit.c
+++ b/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.11 2002/05/16 20:39:02 relyea%netscape.com Exp $
+ # $Id: dbinit.c,v 1.12 2002/05/16 20:48:27 relyea%netscape.com Exp $
  */
 
 #include <ctype.h>
@@ -304,7 +304,7 @@ struct RDBStr {
 int
 db_BeginTransaction(DB *db)
 {
-    RDB *rdb = (RDB *)db;
+    struct RDBStr *rdb = (struct RDBStr *)db;
     if (db->type != DB_RDB) {
 	return 0;
     }
@@ -315,7 +315,7 @@ db_BeginTransaction(DB *db)
 int
 db_FinishTransaction(DB *db, PRBool abort)
 {
-    RDB *rdb = (RDB *)db;
+    struct RDBStr *rdb = (struct RDBStr *)db;
     if (db->type != DB_RDB) {
 	return 0;
     }
diff --git a/security/nss/lib/softoken/pcertdb.c b/security/nss/lib/softoken/pcertdb.c
index 14ba105962e5..9293edf9ba67 100644
--- a/security/nss/lib/softoken/pcertdb.c
+++ b/security/nss/lib/softoken/pcertdb.c
@@ -34,7 +34,7 @@
 /*
  * Permanent Certificate database handling code 
  *
- * $Id: pcertdb.c,v 1.18 2002/05/16 20:39:03 relyea%netscape.com Exp $
+ * $Id: pcertdb.c,v 1.19 2002/05/16 20:48:27 relyea%netscape.com Exp $
  */
 #include "prtime.h"
 
@@ -4066,6 +4066,7 @@ nsslowcert_AddPermCert(NSSLOWCERTCertDBHandle *dbhandle,
     certDBEntryCert *entry;
     PRBool conflict;
     SECStatus ret;
+    SECStatus rv;
 
     nsslowcert_LockDB(dbhandle);
     rv = db_BeginTransaction(dbhandle->permCertDB);