зеркало из https://github.com/mozilla/pjs.git
Remove key.db from the using the blob db code. The blob db code uses the cert7.db record format to
record blobs in the database, which is incompatible with the key3.db format. (key3 does not have any record types).
This commit is contained in:
Родитель
ce929fb460
Коммит
0bbd765dc1
|
@ -32,7 +32,7 @@
|
|||
*
|
||||
* Private Key Database code
|
||||
*
|
||||
* $Id: keydb.c,v 1.27 2002-08-28 21:51:08 relyea%netscape.com Exp $
|
||||
* $Id: keydb.c,v 1.28 2002-09-06 00:18:24 relyea%netscape.com Exp $
|
||||
*/
|
||||
|
||||
#include "lowkeyi.h"
|
||||
|
@ -844,7 +844,7 @@ openNewDB(const char *appName, const char *prefix, const char *dbname,
|
|||
if (appName) {
|
||||
handle->db = rdbopen( appName, prefix, "key", NO_CREATE);
|
||||
} else {
|
||||
handle->db = dbsopen( dbname, NO_CREATE, 0600, DB_HASH, 0 );
|
||||
handle->db = dbopen( dbname, NO_CREATE, 0600, DB_HASH, 0 );
|
||||
}
|
||||
/* if create fails then we lose */
|
||||
if ( handle->db == NULL ) {
|
||||
|
@ -963,7 +963,7 @@ nsslowkey_OpenKeyDB(PRBool readOnly, const char *appName, const char *prefix,
|
|||
if (appName) {
|
||||
handle->db = rdbopen( appName, prefix, "key", openflags);
|
||||
} else {
|
||||
handle->db = dbsopen( dbname, openflags, 0600, DB_HASH, 0 );
|
||||
handle->db = dbopen( dbname, openflags, 0600, DB_HASH, 0 );
|
||||
}
|
||||
|
||||
/* check for correct version number */
|
||||
|
@ -2430,7 +2430,7 @@ nsslowkey_ResetKeyDB(NSSLOWKEYDBHandle *handle)
|
|||
if (handle->appname) {
|
||||
handle->db=rdbopen(handle->appname, handle->dbname, "key", NO_CREATE);
|
||||
} else {
|
||||
handle->db = dbsopen( handle->dbname, NO_CREATE, 0600, DB_HASH, 0 );
|
||||
handle->db = dbopen( handle->dbname, NO_CREATE, 0600, DB_HASH, 0 );
|
||||
}
|
||||
if (handle->db == NULL) {
|
||||
/* set an error code */
|
||||
|
|
Загрузка…
Ссылка в новой задаче