External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-20 06:10:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unbreak user registration after SuperUser changes.

Browse source
This commit is contained in:
Mikkel Krautz 2011-05-20 21:35:42 +02:00
parent 4e95d40645
commit 7c46c9d140
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server.go
View file

@ -155,6 +155,7 @@ func NewServer(id int64, addr string, port int) (s *Server, err os.Error) {
s.Users[0], err = NewUser(0, "SuperUser")
s.UserNameMap["SuperUser"] = s.Users[0]
s.nextUserId = 1
s.Channels = make(map[int]*Channel)
s.aclcache = NewACLCache()
@ -1053,22 +1054,22 @@ func (s *Server) FreezeServer() io.ReadCloser {
}
// Register a client on the server.
func (s *Server) RegisterClient(client *Client) (uid uint32) {
func (s *Server) RegisterClient(client *Client) (uid uint32, err os.Error) {
// Increment nextUserId only if registration succeeded.
defer func() {
if uid > 0 {
if err == nil {
s.nextUserId += 1
}
}()
user, err := NewUser(s.nextUserId, client.Username)
if err != nil {
return 0
return 0, err
}
// Grumble can only register users with certificates.
if len(client.CertHash) == 0 {
return 0
return 0, os.NewError("no cert hash")
}
user.Email = client.Email
@ -1078,7 +1079,8 @@ func (s *Server) RegisterClient(client *Client) (uid uint32) {
s.Users[uid] = user
s.UserCertMap[client.CertHash] = user
s.UserNameMap[client.Username] = user
return uid
return uid, nil
}
// Remove a registered user.