From 63647ffae6715853ec72ae0bfd6f45e22b6f6c2f Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Thu, 16 May 2013 02:52:40 -0400 Subject: [PATCH] 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 file 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 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. */ -- 2.47.3