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

Proper usernames in ACLs.

Browse source
This commit is contained in:
Mikkel Krautz 2011-04-28 00:33:21 +02:00
parent 073587691e
commit 298b105c1f
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
message.go
View file

@ -1008,14 +1008,18 @@ func (server *Server) handleAclMessage(client *Client, msg *Message) {
} }
// Map the user ids in the user map to usernames of users. // Map the user ids in the user map to usernames of users.
// fixme(mkrautz): This requires a persistent datastore, because it retrieves registered users.
queryusers := &mumbleproto.QueryUsers{} queryusers := &mumbleproto.QueryUsers{}
for uid, _ := range users { for uid, _ := range users {
user, ok := server.Users[uint32(uid)]
if !ok {
log.Printf("Invalid user id in ACL")
continue
}
queryusers.Ids = append(queryusers.Ids, uint32(uid)) queryusers.Ids = append(queryusers.Ids, uint32(uid))
queryusers.Names = append(queryusers.Names, "Unknown") queryusers.Names = append(queryusers.Names, user.Name)
} }
if len(queryusers.Ids) > 0 { if len(queryusers.Ids) > 0 {
client.sendProtoMessage(MessageQueryUsers, reply) client.sendProtoMessage(MessageQueryUsers, queryusers)
} }
// Set new groups and ACLs // Set new groups and ACLs