mirror of
https://github.com/mumble-voip/mumble.git
synced 2025-10-26 11:19:16 +00:00
Try to fix channel limit override by subchan delete
Try to remove the ability to join a full channel by creating a temporary sub channel then joining it and removing it (discovered by @Natenom). Check isChannelFull in addition to existing hasPermissions ChanACL::Enter check.
This commit is contained in:
parent
ccdb88f872
commit
2faf905167
@ -1626,7 +1626,7 @@ void Server::removeChannel(Channel *chan, Channel *dest) {
|
||||
}
|
||||
|
||||
Channel *target = dest;
|
||||
while (target->cParent && ! hasPermission(static_cast<ServerUser *>(p), target, ChanACL::Enter))
|
||||
while (target->cParent && (! hasPermission(static_cast<ServerUser *>(p), target, ChanACL::Enter) || isChannelFull(target, static_cast<ServerUser *>(p))))
|
||||
target = target->cParent;
|
||||
|
||||
MumbleProto::UserState mpus;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user