From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 16 May 2013 06:52:40 +0000 (-0400)
Subject: Fix NSS crypto back end for mutex changes
X-Git-Tag: krb5-1.12-alpha1~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63647ffae6715853ec72ae0bfd6f45e22b6f6c2f;p=thirdparty%2Fkrb5.git

Fix NSS crypto back end for mutex changes

Adjust a stray k5_mutex_lock invocation in the NSS crypto back end
after 6350fd0c909d84c00200885e722cc902049ada05.
---

diff --git a/src/lib/crypto/nss/enc_provider/enc_gen.c b/src/lib/crypto/nss/enc_provider/enc_gen.c
index b7dc06d826..dea22f8466 100644
--- a/src/lib/crypto/nss/enc_provider/enc_gen.c
+++ b/src/lib/crypto/nss/enc_provider/enc_gen.c
@@ -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. */