From dd5b08bdc1364887cd97eb7cf7f6d0151abf9d6a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 14:34:54 -0800
Subject: [PATCH] fix unlock of locker not mutex, don't pack permission
 defaults

---
 domain-server/src/DomainServerSettingsManager.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index ad0381a697..2c3cf0f17b 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -686,9 +686,6 @@ void DomainServerSettingsManager::unpackPermissions() {
 
             // add the permissions to the standard map
             _standardAgentPermissions[standardKey] = perms;
-
-            // this will require a packing of permissions
-            needPack = true;
         }
     }
 
@@ -1080,7 +1077,7 @@ QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QStrin
         return *foundValue;
     } else {
         // we don't need the settings lock anymore since we're done reading from the config map
-        _settingsLock.unlock();
+        locker.unlock();
 
         int dotIndex = keyPath.indexOf('.');