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

Fix protobuf enum types.

Browse source
This commit is contained in:
Mikkel Krautz 2011-09-08 13:40:05 +02:00
parent 0161969df1
commit 92e6ac5276
3 changed files with 39 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server.go
View file

@ -427,7 +427,7 @@ func (server *Server) handleAuthenticate(client *Client, msg *Message) {
// Did we get a username?
if auth.Username == nil || len(*auth.Username) == 0 {
client.RejectAuth("InvalidUsername", "Please specify a username to log in")
client.RejectAuth(mumbleproto.Reject_InvalidUsername, "Please specify a username to log in")
return
}
@ -449,17 +449,17 @@ func (server *Server) handleAuthenticate(client *Client, msg *Message) {
if client.Username == "SuperUser" {
if auth.Password == nil {
client.RejectAuth("WrongUserPW", "")
client.RejectAuth(mumbleproto.Reject_WrongUserPW, "")
return
} else {
if server.CheckSuperUserPassword(*auth.Password) {
client.user, ok = server.UserNameMap[client.Username]
if !ok {
client.RejectAuth("InvalidUsername", "")
client.RejectAuth(mumbleproto.Reject_InvalidUsername, "")
return
}
} else {
client.RejectAuth("WrongUserPW", "")
client.RejectAuth(mumbleproto.Reject_WrongUserPW, "")
return
}
}
@ -470,7 +470,7 @@ func (server *Server) handleAuthenticate(client *Client, msg *Message) {
if len(client.CertHash) > 0 && user.CertHash == client.CertHash {
client.user = user
} else {
client.RejectAuth("WrongUserPW", "Wrong certificate hash")
client.RejectAuth(mumbleproto.Reject_WrongUserPW, "Wrong certificate hash")
return
}
}
@ -538,7 +538,7 @@ func (server *Server) finishAuthenticate(client *Client) {
// The user is already present on the server.
if found {
// todo(mkrautz): Do the address checking.
client.RejectAuth("UsernameInUse", "A client is already connected using those credentials.")
client.RejectAuth(mumbleproto.Reject_UsernameInUse, "A client is already connected using those credentials.")
return
}