From 298b105c1fa22936c2ddac04a56e2f6b0da7f87d Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Thu, 28 Apr 2011 00:33:21 +0200 Subject: [PATCH] Proper usernames in ACLs. --- message.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/message.go b/message.go index 28650d3..d40fb99 100644 --- a/message.go +++ b/message.go @@ -1008,14 +1008,18 @@ func (server *Server) handleAclMessage(client *Client, msg *Message) { } // 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{} 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.Names = append(queryusers.Names, "Unknown") + queryusers.Names = append(queryusers.Names, user.Name) } if len(queryusers.Ids) > 0 { - client.sendProtoMessage(MessageQueryUsers, reply) + client.sendProtoMessage(MessageQueryUsers, queryusers) } // Set new groups and ACLs