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

Only send configuration updates to the channel if there is a channel to send it to - otherwise it hangs forever...

Browse source
This commit is contained in:
Ola Bini 2020-01-14 14:35:28 +00:00
parent ef96dd74e5
commit c109af8d88
No known key found for this signature in database
GPG key ID: 6786A150F6A2B28F
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/server.go
View file

@ -192,7 +192,9 @@ func (server *Server) setConfigPassword(key, password string) {
// Could be racy, but shouldn't really matter... // Could be racy, but shouldn't really matter...
val := "sha1$" + salt + "$" + digest val := "sha1$" + salt + "$" + digest
server.cfg.Set(key, val) server.cfg.Set(key, val)
server.cfgUpdate <- &KeyValuePair{Key: key, Value: val} if server.cfgUpdate != nil {
server.cfgUpdate <- &KeyValuePair{Key: key, Value: val}
}
} }
// Set password as the new SuperUser password // Set password as the new SuperUser password
@ -550,11 +552,10 @@ func (server *Server) handleAuthenticate(client *Client, msg *Message) {
if auth.Password == nil { if auth.Password == nil {
client.RejectAuth(mumbleproto.Reject_WrongServerPW, "Invalid server password") client.RejectAuth(mumbleproto.Reject_WrongServerPW, "Invalid server password")
return return
} else { }
if !server.checkServerPassword(*auth.Password) { if !server.checkServerPassword(*auth.Password) {
client.RejectAuth(mumbleproto.Reject_WrongServerPW, "Invalid server password") client.RejectAuth(mumbleproto.Reject_WrongServerPW, "Invalid server password")
return return
}
} }
} }