commit 1a489c9af1b0481ad9570968c5fecd56854580db
author Bodo Möller <bodo@openssl.org> Mon Sep 15 20:41:24 2008 +0000
committer Bodo Möller <bodo@openssl.org> Mon Sep 15 20:41:24 2008 +0000
tree 9bc5ca113210cd6152553714fde924c6fa40d84c
parent 8c864e54662118bc5fbbfee972b4cb2d1cc090ee

From branch OpenSSL_0_9_8-stable: Allow soft-loading engines.

Also, fix CHANGES (consistency with stable branch).

apps/openssl.c

diff --git a/apps/openssl.c b/apps/openssl.c
index 8323b59..5d61d17 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -272,9 +272,21 @@
 	i=NCONF_load(config,p,&errline);
 	if (i == 0)
 		{
-		NCONF_free(config);
-		config = NULL;
-		ERR_clear_error();
+		if (ERR_GET_REASON(ERR_peek_last_error())
+		    == CONF_R_NO_SUCH_FILE)
+			{
+			BIO_printf(bio_err,
+				   "WARNING: can't open config file: %s\n",p);
+			ERR_clear_error();
+			NCONF_free(config);
+			config = NULL;
+			}
+		else
+			{
+			ERR_print_errors(bio_err);
+			NCONF_free(config);
+			exit(1);
+			}
 		}
 
 	prog=prog_init();