openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't load same config file twice. 

RT#4215

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2016-05-15 18:43:03 +01:00
parent 727ee8cfeb
commit c821defc3f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ca.c
View File

@ -479,7 +479,7 @@ end_of_options:
if ((conf = app_load_config(configfile)) == NULL)
goto end;
if (!app_load_modules(conf))
if (configfile != default_config_file && !app_load_modules(conf))
goto end;
/* Lets get the config section we are using */

2
apps/req.c
View File

@ -386,7 +386,7 @@ int req_main(int argc, char **argv)
if (verbose)
BIO_printf(bio_err, "Using configuration from %s\n", template);
req_conf = app_load_config(template);
if (!app_load_modules(req_conf))
if (template != default_config_file && !app_load_modules(req_conf))
goto end;
if (req_conf != NULL) {

2
apps/srp.c
View File

@ -359,7 +359,7 @@ int srp_main(int argc, char **argv)
conf = app_load_config(configfile);
if (conf == NULL)
goto end;
if (!app_load_modules(conf))
if (configfile != default_config_file && !app_load_modules(conf))
goto end;
/* Lets get the config section we are using */

2
apps/ts.c
View File

@ -339,7 +339,7 @@ int ts_main(int argc, char **argv)
}
conf = load_config_file(configfile);
if (!app_load_modules(conf))
if (configfile != default_config_file && !app_load_modules(conf))
goto end;
/* Check parameter consistency and execute the appropriate function. */