diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 15:23:14 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 15:23:14 +0200 |
| commit | 6f84242a3526c6889950b43d29f1c47d05b918b2 (patch) | |
| tree | 9b06788bac84d7cf9313fa4b562a8e54a2042b65 /security/nss/tests/merge/merge.sh | |
| parent | b2c78bbf83f75bf034028814329fdd43b6bfe885 (diff) | |
| download | UXP-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/tests/merge/merge.sh')
| -rwxr-xr-x | security/nss/tests/merge/merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/nss/tests/merge/merge.sh b/security/nss/tests/merge/merge.sh index 1929b12c8..d17a8c4ef 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= ; export NSS_DEFAULT_DB_TYPE + NSS_DEFAULT_DB_TYPE=dbm ; export NSS_DEFAULT_DB_TYPE fi certutil -N -d ${CONFLICT1DIR} -f ${R_PWFILE} |