nss-646045.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132333435
  1. diff -up nss/tests/dbtests/dbtests.sh.646045 nss/tests/dbtests/dbtests.sh
  2. --- nss/tests/dbtests/dbtests.sh.646045 2013-04-04 13:31:55.000000000 -0700
  3. +++ nss/tests/dbtests/dbtests.sh 2013-04-04 15:57:46.298127149 -0700
  4. @@ -168,6 +168,9 @@ dbtest_main()
  5. cat $RONLY_DIR/* > /dev/null
  6. fi
  7. + # skipping the next two tests when user is root,
  8. + # otherwise they would fail due to rooty powers
  9. + if [[ $EUID -ne 0 ]] then
  10. ${BINDIR}/dbtest -d $RONLY_DIR
  11. ret=$?
  12. if [ $ret -ne 46 ]; then
  13. @@ -175,6 +178,10 @@ dbtest_main()
  14. else
  15. html_passed "Dbtest r/w didn't work in an readonly dir $ret"
  16. fi
  17. + else
  18. + html_passed "Skipping Dbtest r/w in a readonly dir because user is root"
  19. + fi
  20. + if [[ $EUID -ne 0 ]] then
  21. ${BINDIR}/certutil -D -n "TestUser" -d .
  22. ret=$?
  23. if [ $ret -ne 255 ]; then
  24. @@ -182,6 +189,9 @@ dbtest_main()
  25. else
  26. html_passed "Certutil didn't work in an readonly dir $ret"
  27. fi
  28. + else
  29. + html_passed "Skipping Certutil delete cert in an readonly directory test because user is root"
  30. + fi
  31. Echo "test opening the database ronly in a readonly directory"