summaryrefslogtreecommitdiffstats
path: root/security/nss/lib/util
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-06-06 15:23:14 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-06-06 15:23:14 +0200
commit6f84242a3526c6889950b43d29f1c47d05b918b2 (patch)
tree9b06788bac84d7cf9313fa4b562a8e54a2042b65 /security/nss/lib/util
parentb2c78bbf83f75bf034028814329fdd43b6bfe885 (diff)
downloadUXP-6f84242a3526c6889950b43d29f1c47d05b918b2.tar
UXP-6f84242a3526c6889950b43d29f1c47d05b918b2.tar.gz
UXP-6f84242a3526c6889950b43d29f1c47d05b918b2.tar.lz
UXP-6f84242a3526c6889950b43d29f1c47d05b918b2.tar.xz
UXP-6f84242a3526c6889950b43d29f1c47d05b918b2.zip
Revert "Restore NSS default storage file format to DBM when no prefix is given."
This reverts commit b2c78bbf83f75bf034028814329fdd43b6bfe885.
Diffstat (limited to 'security/nss/lib/util')
-rw-r--r--security/nss/lib/util/utilpars.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/security/nss/lib/util/utilpars.c b/security/nss/lib/util/utilpars.c
index 88e38b16d..e7435bfcc 100644
--- a/security/nss/lib/util/utilpars.c
+++ b/security/nss/lib/util/utilpars.c
@@ -1111,12 +1111,8 @@ _NSSUTIL_EvaluateConfigDir(const char *configdir,
NSSDBType dbType;
PRBool checkEnvDefaultDB = PR_FALSE;
*appName = NULL;
-/* force the default */
-#ifdef NSS_DISABLE_DBM
+ /* force the default */
dbType = NSS_DB_TYPE_SQL;
-#else
- dbType = NSS_DB_TYPE_LEGACY;
-#endif
if (configdir == NULL) {
checkEnvDefaultDB = PR_TRUE;
} else if (PORT_Strncmp(configdir, MULTIACCESS, sizeof(MULTIACCESS) - 1) == 0) {