svn rev #24361: branches/nss/src/lib/crypto/nss/enc_provider/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24361
Commit By: ghudson
Log Message:
Fix cleanup handler in k5_nss_init to return an error if there is one.



Changed Files:
U   branches/nss/src/lib/crypto/nss/enc_provider/enc_gen.c
Modified: branches/nss/src/lib/crypto/nss/enc_provider/enc_gen.c
===================================================================
--- branches/nss/src/lib/crypto/nss/enc_provider/enc_gen.c	2010-09-27 17:16:47 UTC (rev 24360)
+++ branches/nss/src/lib/crypto/nss/enc_provider/enc_gen.c	2010-09-27 17:47:40 UTC (rev 24361)
@@ -118,7 +118,7 @@
             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 @@
 
 cleanup:
     k5_mutex_unlock(&k5_nss_lock);
-    return 0;
+    return ret;
 }
 
 PK11Context *