Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorvald Natvig <slicer@users.sourceforge.net>2009-04-29 17:15:07 +0400
committerThorvald Natvig <slicer@users.sourceforge.net>2009-04-29 17:15:07 +0400
commitd6b878a82fd0ddaa117d41990a0d98a11d889d20 (patch)
treee21ea2123f380d725793c6c1ca341d58e139c3ce /src/murmur/DBus.cpp
parent53e9b9d77fa373e19bffe52adc5c54fc1412472a (diff)
Expand ACL permissions serverside
Diffstat (limited to 'src/murmur/DBus.cpp')
-rw-r--r--src/murmur/DBus.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/murmur/DBus.cpp b/src/murmur/DBus.cpp
index f8c0bedf4..6c8ed1a78 100644
--- a/src/murmur/DBus.cpp
+++ b/src/murmur/DBus.cpp
@@ -528,8 +528,8 @@ void MurmurDBus::setACL(int id, const QList<ACLInfo> &acls, const QList<GroupInf
a->bApplySubs = ai.applySubs;
a->iPlayerId = ai.playerid;
a->qsGroup = ai.group;
- a->pDeny = static_cast<ChanACL::Permissions>(ai.deny);
- a->pAllow = static_cast<ChanACL::Permissions>(ai.allow);
+ a->pDeny = static_cast<ChanACL::Permissions>(ai.deny) & ChanACL::All;
+ a->pAllow = static_cast<ChanACL::Permissions>(ai.allow) & ChanACL::All;
}
server->clearACLCache();