[27761] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix NSS crypto back end for mutex changes
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu May 16 14:38:27 2013
Date: Thu, 16 May 2013 14:38:21 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201305161838.r4GIcLis022905@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/63647ffae6715853ec72ae0bfd6f45e22b6f6c2f
commit 63647ffae6715853ec72ae0bfd6f45e22b6f6c2f
Author: Greg Hudson <ghudson@mit.edu>
Date: Thu May 16 02:52:40 2013 -0400
Fix NSS crypto back end for mutex changes
Adjust a stray k5_mutex_lock invocation in the NSS crypto back end
after 6350fd0c909d84c00200885e722cc902049ada05.
src/lib/crypto/nss/enc_provider/enc_gen.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/lib/crypto/nss/enc_provider/enc_gen.c b/src/lib/crypto/nss/enc_provider/enc_gen.c
index b7dc06d..dea22f8 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. */
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
