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 | |
| 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')
| -rw-r--r-- | security/nss/lib/util/utilpars.c | 6 | ||||
| -rwxr-xr-x | security/nss/tests/all.sh | 3 | ||||
| -rwxr-xr-x | security/nss/tests/merge/merge.sh | 2 |
3 files changed, 7 insertions, 4 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) { diff --git a/security/nss/tests/all.sh b/security/nss/tests/all.sh index 8d5bd2dbb..06a39dfe6 100755 --- a/security/nss/tests/all.sh +++ b/security/nss/tests/all.sh @@ -174,9 +174,8 @@ run_cycle_pkix() NSS_SSL_TESTS=`echo "${NSS_SSL_TESTS}" | sed -e "s/normal//g" -e "s/fips//g" -e "s/_//g"` export -n NSS_SSL_RUN - # use the default format. (unset for the shell, export -n for binaries) + # use the default format. export -n NSS_DEFAULT_DB_TYPE - unset NSS_DEFAULT_DB_TYPE run_tests } diff --git a/security/nss/tests/merge/merge.sh b/security/nss/tests/merge/merge.sh index d17a8c4ef..1929b12c8 100755 --- a/security/nss/tests/merge/merge.sh +++ b/security/nss/tests/merge/merge.sh @@ -98,7 +98,7 @@ merge_init() # are dbm databases. if [ "${TEST_MODE}" = "UPGRADE_DB" ]; then save=${NSS_DEFAULT_DB_TYPE} - NSS_DEFAULT_DB_TYPE=dbm ; export NSS_DEFAULT_DB_TYPE + NSS_DEFAULT_DB_TYPE= ; export NSS_DEFAULT_DB_TYPE fi certutil -N -d ${CONFLICT1DIR} -f ${R_PWFILE} |