summaryrefslogtreecommitdiffstats
path: root/security/nss/tests/merge/merge.sh
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-06-05 22:33:20 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-06-05 22:38:40 +0200
commitb2c78bbf83f75bf034028814329fdd43b6bfe885 (patch)
tree28bdb281c8ce77cc7610468be49f7ad017ed13d2 /security/nss/tests/merge/merge.sh
parent3545238cc6bc0e73ec5b03ca9dd94bf216c93a26 (diff)
downloadUXP-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/tests/merge/merge.sh')
-rwxr-xr-xsecurity/nss/tests/merge/merge.sh2
1 files changed, 1 insertions, 1 deletions
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}