diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2016-05-15 18:43:03 +0100 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2016-05-16 18:29:27 +0100 |
commit | c821defc3f728a491856b7286e5b2cbda96a3563 (patch) | |
tree | 1e2a24582b4ce8a64b05423b44453b044e760618 | |
parent | 727ee8cfeb2893d5aec4a6e571e9adf0667e9135 (diff) | |
download | openssl-c821defc3f728a491856b7286e5b2cbda96a3563.tar.gz |
Don't load same config file twice.
RT#4215
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r-- | apps/ca.c | 2 | ||||
-rw-r--r-- | apps/req.c | 2 | ||||
-rw-r--r-- | apps/srp.c | 2 | ||||
-rw-r--r-- | apps/ts.c | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -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 */ diff --git a/apps/req.c b/apps/req.c index 7f4a946aaa..cd51c18a44 100644 --- a/apps/req.c +++ b/apps/req.c @@ -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) { diff --git a/apps/srp.c b/apps/srp.c index 48ef85ded3..14f837f360 100644 --- a/apps/srp.c +++ b/apps/srp.c @@ -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 */ @@ -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. */ |