diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-05 22:33:20 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-05 22:38:40 +0200 |
commit | b2c78bbf83f75bf034028814329fdd43b6bfe885 (patch) | |
tree | 28bdb281c8ce77cc7610468be49f7ad017ed13d2 /security/nss/lib/util/utilpars.c | |
parent | 3545238cc6bc0e73ec5b03ca9dd94bf216c93a26 (diff) | |
download | UXP-b2c78bbf83f75bf034028814329fdd43b6bfe885.tar UXP-b2c78bbf83f75bf034028814329fdd43b6bfe885.tar.gz UXP-b2c78bbf83f75bf034028814329fdd43b6bfe885.tar.lz UXP-b2c78bbf83f75bf034028814329fdd43b6bfe885.tar.xz UXP-b2c78bbf83f75bf034028814329fdd43b6bfe885.zip |
Restore NSS default storage file format to DBM when no prefix is given.NSS_3.35_TEST
Diffstat (limited to 'security/nss/lib/util/utilpars.c')
-rw-r--r-- | security/nss/lib/util/utilpars.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/security/nss/lib/util/utilpars.c b/security/nss/lib/util/utilpars.c index e7435bfcc..88e38b16d 100644 --- a/security/nss/lib/util/utilpars.c +++ b/security/nss/lib/util/utilpars.c @@ -1111,8 +1111,12 @@ _NSSUTIL_EvaluateConfigDir(const char *configdir, NSSDBType dbType; PRBool checkEnvDefaultDB = PR_FALSE; *appName = NULL; - /* force the default */ +/* force the default */ +#ifdef NSS_DISABLE_DBM 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) { |