TeaSpeak
/
Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.4.10-openssl' into 1.5.0

This commit is contained in:
WolverinDEV 2020-03-10 17:04:45 +01:00
parent 60a1c34dc9 d6314f22b2
commit c002be7307
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/client/ConnectedClient.cpp
View File

@ -565,6 +565,11 @@ bool ConnectedClient::notifyClientNeededPermissions() {
cmd[index++]["permvalue"] = 0;
}
if(index == 0) {
cmd[index]["permid"] = permission::i_client_talk_power;
cmd[index++]["permvalue"] = 0;
}
this->sendCommand(cmd);
return true;
}

2
server/src/client/query/QueryClientCommands.cpp
View File

@ -303,7 +303,7 @@ command_result QueryClient::handleCommandServerSelect(Command &cmd) {
target = serverInstance->getVoiceServerManager()->findServerById(static_cast<ServerId>(stol(parm)));
if(!target && (!cmd[0].has("0") && (!cmd[0].has("sid") || !cmd["sid"] == 0))) return command_result{error::server_invalid_id, "Invalid server id"};
if(target && target->getState() != ServerState::ONLINE) return command_result{error::server_is_not_running};
if(target && target->getState() != ServerState::ONLINE && target->getState() != ServerState::OFFLINE) return command_result{error::server_is_not_running};
if(target == this->server) return command_result{error::ok};
if(target) {

1
server/src/lincense/LicenseService.cpp
View File

@ -160,6 +160,7 @@ void LicenseService::execute_dns_request() {
}
void LicenseService::handle_check_succeeded() {
this->timings.last_succeeded = std::chrono::system_clock::now();
{
std::lock_guard rlock{this->request_lock};
this->abort_request(rlock, strobf("request succeeded").string());