diff options
| author | Robert Relyea <rrelyea@redhat.com> | 2016-10-26 11:12:57 -0700 |
|---|---|---|
| committer | Robert Relyea <rrelyea@redhat.com> | 2016-10-26 11:12:57 -0700 |
| commit | 1e4982bafacf38683e8fc77105b0da1fe63ae595 (patch) | |
| tree | f112a7fbfd1d0e50fc9b0c349e1e466a4c5054ba /tests/merge | |
| parent | 9ff427fa9cc70227861e2f4611601a33d5148a10 (diff) | |
| download | nss-hg-1e4982bafacf38683e8fc77105b0da1fe63ae595.tar.gz | |
Bug 1282627 - Merge can be confused with a modified trust flags set.
r=franziskus
Diffstat (limited to 'tests/merge')
| -rwxr-xr-x | tests/merge/merge.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/merge/merge.sh b/tests/merge/merge.sh index f3955080e..1929b12c8 100755 --- a/tests/merge/merge.sh +++ b/tests/merge/merge.sh @@ -104,7 +104,9 @@ merge_init() certutil -N -d ${CONFLICT1DIR} -f ${R_PWFILE} certutil -N -d ${CONFLICT2DIR} -f ${R_PWFILE} certutil -A -n Alice -t ,, -i ${R_CADIR}/TestUser41.cert -d ${CONFLICT1DIR} - certutil -A -n "Alice #1" -t ,, -i ${R_CADIR}/TestUser42.cert -d ${CONFLICT1DIR} + # modify CONFLICTDIR potentially corrupting the database + certutil -A -n "Alice #1" -t C,, -i ${R_CADIR}/TestUser42.cert -d ${CONFLICT1DIR} -f ${R_PWFILE} + certutil -M -n "Alice #1" -t ,, -d ${CONFLICT1DIR} -f ${R_PWFILE} certutil -A -n "Alice #99" -t ,, -i ${R_CADIR}/TestUser43.cert -d ${CONFLICT1DIR} certutil -A -n Alice -t ,, -i ${R_CADIR}/TestUser44.cert -d ${CONFLICT2DIR} certutil -A -n "Alice #1" -t ,, -i ${R_CADIR}/TestUser45.cert -d ${CONFLICT2DIR} @@ -268,5 +270,8 @@ merge_cleanup() merge_init merge_main +echo "TEST_MODE=${TEST_MODE}" +echo "NSS_DEFAULT_DB_TYPE=${NSS_DEFAULT_DB_TYPE}" merge_cleanup + |