nss/patches/nss-646045.patch0

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