From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 15 May 2016 17:43:03 +0000 (+0100)
Subject: Don't load same config file twice.
X-Git-Tag: OpenSSL_1_1_0-pre6~823
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c821defc3f728a491856b7286e5b2cbda96a3563;p=oweals%2Fopenssl.git

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 880e0b9a19..ac71e08837 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -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 */
diff --git a/apps/ts.c b/apps/ts.c
index d55d2397aa..8a7b5ed9b9 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -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. */