From f3f46476cda7f583116d5434d5cf1bf0e7d66621 Mon Sep 17 00:00:00 2001 From: "relyea%netscape.com" Date: Mon, 20 Jun 2005 23:17:12 +0000 Subject: [PATCH] Test multiaccess Databases. This patch causes softoken to Always use the multiaccess Database for clients. This is not intended for the final release git-svn-id: svn://10.0.0.236/branches/BOB_TEST_MULTIACCESS@174894 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/softoken/dbinit.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mozilla/security/nss/lib/softoken/dbinit.c b/mozilla/security/nss/lib/softoken/dbinit.c index 275be90357d..5aaaa0474dd 100644 --- a/mozilla/security/nss/lib/softoken/dbinit.c +++ b/mozilla/security/nss/lib/softoken/dbinit.c @@ -36,7 +36,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: dbinit.c,v 1.25 2005-03-29 18:21:18 nelsonb%netscape.com Exp $ */ +/* $Id: dbinit.c,v 1.25.8.1 2005-06-20 23:17:12 relyea%netscape.com Exp $ */ #include #include "seccomon.h" @@ -49,6 +49,8 @@ #include "cdbhdl.h" #include "pkcs11i.h" +#define ALWAYS_MULTIACCESS "CommonClient" + static char * sftk_certdb_name_cb(void *arg, int dbVersion) { @@ -121,6 +123,9 @@ sftk_keydb_name_cb(void *arg, int dbVersion) const char * sftk_EvaluateConfigDir(const char *configdir,char **appName) { +#ifdef ALWAYS_MULTIACCESS + *appName = PORT_Strdup(ALWAYS_MULTIACCESS); +#else if (PORT_Strncmp(configdir, MULTIACCESS, sizeof(MULTIACCESS)-1) == 0) { char *cdir; @@ -138,6 +143,7 @@ sftk_EvaluateConfigDir(const char *configdir,char **appName) } configdir = cdir; } +#endif return configdir; }