Cleanup after rebase

This commit is contained in:
Zach Fox 2017-01-17 18:05:03 -08:00
parent d067ba7dcc
commit 1175752e1d

View file

@ -796,7 +796,8 @@ void DomainServerSettingsManager::processUsernameFromIDRequestPacket(QSharedPoin
bool isAdmin = matchingNode->getCanKick();
// Check if the sending node has permission to kick (is an admin)
if (sendingNode->getCanKick()) {
// OR if the message is from a node whose UUID matches the one in the packet
if (sendingNode->getCanKick() || nodeUUID == sendingNode->getUUID()) {
// It's time to figure out the username
QString verifiedUsername = matchingNode->getPermissions().getVerifiedUserName();