Don't load same config file twice. RT#4215 Reviewed-by: Richard Levitte <levitte@openssl.org>
diff --git a/apps/ca.c b/apps/ca.c index 880e0b9..ac71e08 100644 --- a/apps/ca.c +++ b/apps/ca.c
@@ -479,7 +479,7 @@ 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 7f4a946..cd51c18 100644 --- a/apps/req.c +++ b/apps/req.c
@@ -386,7 +386,7 @@ 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 48ef85d..14f837f 100644 --- a/apps/srp.c +++ b/apps/srp.c
@@ -359,7 +359,7 @@ 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 */
diff --git a/apps/ts.c b/apps/ts.c index d55d239..8a7b5ed 100644 --- a/apps/ts.c +++ b/apps/ts.c
@@ -339,7 +339,7 @@ } 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. */