Test multiaccess Databases. This patch causes softoken to Always use the

multiaccess Database for clients. This is not intended for the final release

1 files changed, 6 insertions, 0 deletions

diff --git a/security/nss/lib/softoken/dbinit.c b/security/nss/lib/softoken/dbinit.c
index 110419dac..1bc28eeef 100644
--- a/security/nss/lib/softoken/dbinit.c
+++ b/security/nss/lib/softoken/dbinit.c
@@ -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;
 }