summaryrefslogtreecommitdiffstats
path: root/src/lib/crypto
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-05-16 02:52:40 -0400
committerGreg Hudson <ghudson@mit.edu>2013-05-16 14:37:31 -0400
commit63647ffae6715853ec72ae0bfd6f45e22b6f6c2f (patch)
tree559274be1f521898a3d5032c9d619dbff1dfdb35 /src/lib/crypto
parent6350fd0c909d84c00200885e722cc902049ada05 (diff)
downloadkrb5-63647ffae6715853ec72ae0bfd6f45e22b6f6c2f.tar.gz
krb5-63647ffae6715853ec72ae0bfd6f45e22b6f6c2f.tar.xz
krb5-63647ffae6715853ec72ae0bfd6f45e22b6f6c2f.zip
Fix NSS crypto back end for mutex changes
Adjust a stray k5_mutex_lock invocation in the NSS crypto back end after 6350fd0c909d84c00200885e722cc902049ada05.
Diffstat (limited to 'src/lib/crypto')
-rw-r--r--src/lib/crypto/nss/enc_provider/enc_gen.c7
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 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. */