Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/certdb/stanpcertdb.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "prtime.h"
 
 #include "cert.h"
 #include "certi.h"
 #include "certdb.h"
 #include "secitem.h"
@@ skipping 222 matching lines @@
 
     
 
 SECStatus
 CERT_ChangeCertTrust(CERTCertDBHandle *handle, CERTCertificate *cert,
                     CERTCertTrust *trust)
 {
     SECStatus rv = SECSuccess;
     PRStatus ret;
 
-    CERT_LockCertTrust(cert);
     ret = STAN_ChangeCertTrust(cert, trust);
-    CERT_UnlockCertTrust(cert);
     if (ret != PR_SUCCESS) {
         rv = SECFailure;
         CERT_MapStanError();
     }
     return rv;
 }
 
 extern const NSSError NSS_ERROR_INVALID_CERTIFICATE;
 
 SECStatus
@@ skipping 808 matching lines @@
 __CERT_TraversePermCertsForNickname(CERTCertDBHandle *handle, char *nickname,
                                   void *cb, void *cbarg)
 {
     PORT_Assert("CERT_TraversePermCertsForNickname is Deprecated" == NULL);
     PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
     return SECFailure;
 }