krb5 commit: Fix NSS crypto back end for mutex changes

Greg Hudson ghudson at MIT.EDU
Thu May 16 14:38:21 EDT 2013


https://github.com/krb5/krb5/commit/63647ffae6715853ec72ae0bfd6f45e22b6f6c2f
commit 63647ffae6715853ec72ae0bfd6f45e22b6f6c2f
Author: Greg Hudson <ghudson at 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. */


More information about the cvs-krb5 mailing list