Respect the secure_memory config option

2 files changed, 9 insertions, 1 deletions

diff --git a/src/init_def.cpp b/src/init_def.cpp
index 13687116f..6575f61bb 100644
--- a/src/init_def.cpp
+++ b/src/init_def.cpp
@@ -37,7 +37,7 @@ namespace Init {
 *************************************************/
 void initialize(const InitializerOptions& args)
    {
-   Builtin_Modules modules(false);
+   Builtin_Modules modules(args.secure_memory());
 
    Mutex_Factory* mutex_factory = 0;
 
diff --git a/src/init_opt.cpp b/src/init_opt.cpp
index cce5f65f6..bfd7f075a 100644
--- a/src/init_opt.cpp
+++ b/src/init_opt.cpp
@@ -25,6 +25,14 @@ bool InitializerOptions::thread_safe() const
    }
 
 /*************************************************
+* Check if thread safety was requested           *
+*************************************************/
+bool InitializerOptions::secure_memory() const
+   {
+   return boolean_arg("secure_memory");
+   }
+
+/*************************************************
 * Check if using engines was requested           *
 *************************************************/
 bool InitializerOptions::use_engines() const