b=195574 SSL extremely flaky if Ask for Master Password is 'Every time'

r=darin sr=brendan


git-svn-id: svn://10.0.0.236/trunk@144562 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/manager/ssl/src/nsSDR.cpp

@@ -308,7 +308,7 @@ ChangePassword()
 }
 
 static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
-/* void logout(); */
+
 NS_IMETHODIMP nsSecretDecoderRing::
 Logout()
 {
@@ -322,6 +322,22 @@ Logout()
     PK11_LogoutAll();
   }
 
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSecretDecoderRing::
+LogoutAndTeardown()
+{
+  nsresult rv;
+  nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(kNSSComponentCID, &rv));
+  if (NS_FAILED(rv))
+    return rv;
+
+  {
+    nsNSSShutDownPreventionLock locker;
+    PK11_LogoutAll();
+  }
+
   return nssComponent->LogoutAuthenticatedPK11();
 }