mirror of
https://github.com/mumble-voip/mumble.git
synced 2025-10-26 11:19:16 +00:00
FIX(server): Allow to move temporary channels provided sufficient permissions
Previously it was not possible to move temporary channels at all.
This appears to be not deliberate as the move failed with a
"denied MakeChannel" message. Most likely, this is due to an
oversight in efbba85c60 where temporary channel movement
was simply not considered.
This commit fixes the ACL check to look for MakeTempChannel instead
of MakeChannel when appropriate.
Fixes #1162
This commit is contained in:
parent
0a234f8a00
commit
f9593b8622
@ -1423,8 +1423,10 @@ void Server::msgChannelState(ServerUser *uSource, MumbleProto::ChannelState &msg
|
||||
return;
|
||||
}
|
||||
|
||||
if (!hasPermission(uSource, p, ChanACL::MakeChannel)) {
|
||||
PERM_DENIED(uSource, p, ChanACL::MakeChannel);
|
||||
QFlags< ChanACL::Perm > parentMakePermission =
|
||||
c->bTemporary ? ChanACL::MakeTempChannel : ChanACL::MakeChannel;
|
||||
if (!hasPermission(uSource, p, parentMakePermission)) {
|
||||
PERM_DENIED(uSource, p, parentMakePermission);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user