diff options
author | Bodo Möller <bodo@openssl.org> | 2008-09-15 20:41:24 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 2008-09-15 20:41:24 +0000 |
commit | 1a489c9af1b0481ad9570968c5fecd56854580db (patch) | |
tree | 9bc5ca113210cd6152553714fde924c6fa40d84c /apps/openssl.c | |
parent | 8c864e54662118bc5fbbfee972b4cb2d1cc090ee (diff) |
From branch OpenSSL_0_9_8-stable: Allow soft-loading engines.
Also, fix CHANGES (consistency with stable branch).
Diffstat (limited to 'apps/openssl.c')
-rw-r--r-- | apps/openssl.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index 8323b59659..5d61d171ca 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -272,9 +272,21 @@ int main(int Argc, char *Argv[]) 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(); |