From 7696ead0126c9232a0e388c61fb13fe72352c8c4 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 7 Jun 2016 16:38:52 -0700 Subject: [PATCH] look for standard permissions in standard table rather than in user table --- domain-server/src/DomainGatekeeper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index af449eadec..6377a37f34 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -153,12 +153,12 @@ void DomainGatekeeper::updateNodePermissions() { } if (username.isEmpty()) { - userPerms |= _server->_settingsManager.getPermissionsForName(NodePermissions::standardNameAnonymous); + userPerms |= _server->_settingsManager.getStandardPermissionsForName(NodePermissions::standardNameAnonymous); } else { if (_server->_settingsManager.havePermissionsForName(username)) { userPerms = _server->_settingsManager.getPermissionsForName(username); } else { - userPerms |= _server->_settingsManager.getPermissionsForName(NodePermissions::standardNameLoggedIn); + userPerms |= _server->_settingsManager.getStandardPermissionsForName(NodePermissions::standardNameLoggedIn); } } } @@ -263,7 +263,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect if (username.isEmpty()) { // they didn't tell us who they are - userPerms |= _server->_settingsManager.getPermissionsForName(NodePermissions::standardNameAnonymous); + userPerms |= _server->_settingsManager.getStandardPermissionsForName(NodePermissions::standardNameAnonymous); qDebug() << "user-permissions: no username, so:" << userPerms; } else if (verifyUserSignature(username, usernameSignature, nodeConnection.senderSockAddr)) { // they are sent us a username and the signature verifies it @@ -274,7 +274,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect qDebug() << "user-permissions: specific user matches, so:" << userPerms; } else { // they are logged into metaverse, but we don't have specific permissions for them. - userPerms |= _server->_settingsManager.getPermissionsForName(NodePermissions::standardNameLoggedIn); + userPerms |= _server->_settingsManager.getStandardPermissionsForName(NodePermissions::standardNameLoggedIn); qDebug() << "user-permissions: user is logged in, so:" << userPerms; } } else {