Don't load same config file twice.

RT#4215 Reviewed-by: Richard Levitte <[email protected]>
npmccallum · May 16, 2016 · c821def · c821def
1 parent 727ee8c
commit c821def
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/apps/ca.c b/apps/ca.c
@@ -479,7 +479,7 @@ int ca_main(int argc, char **argv)
 
     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
@@ -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
@@ -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
@@ -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. */