CEF/grumble
1
0
Fork 0
forked from External/grumble
Code Pull requests Activity

Fix ACL message handling for root channel.

Browse source
This commit is contained in:
Mikkel Krautz 2011-04-12 00:02:08 +02:00
parent 96684f41d4
commit c3a75d2b42
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
message.go
View file

@ -943,10 +943,13 @@ func (server *Server) handleAclMessage(client *Client, msg *Message) {
// Also constructs a usermap that is a set user ids from the channel's groups. // Also constructs a usermap that is a set user ids from the channel's groups.
reply.Groups = []*mumbleproto.ACL_ChanGroup{} reply.Groups = []*mumbleproto.ACL_ChanGroup{}
for name, _ := range allnames { for name, _ := range allnames {
group := channel.Groups[name] var (
pgroup, ok := parent.Groups[name] group *Group
if !ok { pgroup *Group
pgroup = nil )
group = channel.Groups[name]
if parent != nil {
pgroup = parent.Groups[name]
} }
mpgroup := &mumbleproto.ACL_ChanGroup{} mpgroup := &mumbleproto.ACL_ChanGroup{}