From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 27 Sep 2010 17:47:40 +0000 (+0000)
Subject: Fix cleanup handler in k5_nss_init to return an error if there is one
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c37e3d804ef7a4afa9a3cf240c46b7c04cec6aec;p=thirdparty%2Fkrb5.git

Fix cleanup handler in k5_nss_init to return an error if there is one

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/nss@24361 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/crypto/nss/enc_provider/enc_gen.c b/src/lib/crypto/nss/enc_provider/enc_gen.c
index c3ea152284..90f7815f18 100644
--- a/src/lib/crypto/nss/enc_provider/enc_gen.c
+++ b/src/lib/crypto/nss/enc_provider/enc_gen.c
@@ -118,7 +118,7 @@ k5_nss_init(void)
             goto cleanup;
         }
     }
-    k5_nss_ctx = NSS_InitContext(NSS_KRB5_CONFIGDIR, "", "", "", NULL, flags);
+    k5_nss_ctx = NULL;
     if (k5_nss_ctx == NULL) {
         /* There may be no system database; try again without it. */
         flags |= NSS_INIT_NOMODDB | NSS_INIT_NOCERTDB;
@@ -132,7 +132,7 @@ k5_nss_init(void)
 
 cleanup:
     k5_mutex_unlock(&k5_nss_lock);
-    return 0;
+    return ret;
 }
 
 PK11Context *