aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2010-09-27 17:47:40 +0000
committerGreg Hudson <ghudson@mit.edu>2010-09-27 17:47:40 +0000
commitc37e3d804ef7a4afa9a3cf240c46b7c04cec6aec (patch)
tree959c472928b4e7a2cb8ddc29c1c4d4ecde3fb4fd
parentf78b7496a91e172bb1b8ebddd6cf83cee42ab5c7 (diff)
downloadkrb5-c37e3d804ef7a4afa9a3cf240c46b7c04cec6aec.zip
krb5-c37e3d804ef7a4afa9a3cf240c46b7c04cec6aec.tar.gz
krb5-c37e3d804ef7a4afa9a3cf240c46b7c04cec6aec.tar.bz2
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
-rw-r--r--src/lib/crypto/nss/enc_provider/enc_gen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/crypto/nss/enc_provider/enc_gen.c b/src/lib/crypto/nss/enc_provider/enc_gen.c
index c3ea152..90f7815 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 *