]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Fix cleanup handler in k5_nss_init to return an error if there is one
authorGreg Hudson <ghudson@mit.edu>
Mon, 27 Sep 2010 17:47:40 +0000 (17:47 +0000)
committerGreg Hudson <ghudson@mit.edu>
Mon, 27 Sep 2010 17:47:40 +0000 (17:47 +0000)
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/nss@24361 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/crypto/nss/enc_provider/enc_gen.c

index c3ea15228462df669f07b64f5f9561a92e1eb00a..90f7815f1887eaeb26b826ca233d5add3a15976f 100644 (file)
@@ -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 *