]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Fix NSS crypto back end for mutex changes
authorGreg Hudson <ghudson@mit.edu>
Thu, 16 May 2013 06:52:40 +0000 (02:52 -0400)
committerGreg Hudson <ghudson@mit.edu>
Thu, 16 May 2013 18:37:31 +0000 (14:37 -0400)
Adjust a stray k5_mutex_lock invocation in the NSS crypto back end
after 6350fd0c909d84c00200885e722cc902049ada05.

src/lib/crypto/nss/enc_provider/enc_gen.c

index b7dc06d82677acad7fefd2506d99ed4fd0212087..dea22f846623aaa6ea04bf5ac731ecab26077dbc 100644 (file)
@@ -96,14 +96,11 @@ krb5_error_code
 k5_nss_init(void)
 {
     PRUint32 flags = NSS_INIT_READONLY | NSS_INIT_NOROOTINIT;
-    krb5_error_code ret;
+    krb5_error_code ret = 0;
     SECStatus rv;
     pid_t pid;
 
-    ret = k5_mutex_lock(&k5_nss_lock);
-    if (ret)
-        return ret;
-
+    k5_mutex_lock(&k5_nss_lock);
     pid = getpid();
     if (k5_nss_ctx != NULL) {
         /* Do nothing if the existing context is still good. */