From 78283a0e0eff009b91824df8ce4d8d6b653cce0d Mon Sep 17 00:00:00 2001
From: "Daniel J. Hofmann" <daniel@trvx.org>
Date: Tue, 13 Oct 2015 16:12:29 +0200
Subject: [PATCH] Check if memory locking should be done before locking
 unconditionally

---
 routed.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routed.cpp b/routed.cpp
index f585838c7..b6552e918 100644
--- a/routed.cpp
+++ b/routed.cpp
@@ -93,7 +93,7 @@ int main(int argc, const char *argv[]) try
     {
         explicit MemoryLocker(bool shouldLock_) : shouldLock(shouldLock_)
         {
-            if (-1 == mlockall(MCL_CURRENT | MCL_FUTURE))
+            if (shouldLock && -1 == mlockall(MCL_CURRENT | MCL_FUTURE))
             {
                 couldLock = false;
                 SimpleLogger().Write(logWARNING) << "memory could not be locked to RAM";
@@ -101,7 +101,7 @@ int main(int argc, const char *argv[]) try
         }
         ~MemoryLocker()
         {
-            if (couldLock)
+            if (shouldLock && couldLock)
                 (void)munlockall();
         }
         bool shouldLock = false, couldLock = true;