forked from External/ergo
enum types simplifying sort, config fails on wrong action types
This commit is contained in:
parent
5e7aceb75e
commit
6a9fa35d35
5 changed files with 151 additions and 63 deletions
|
|
@ -446,11 +446,6 @@ func (server *Server) tryRegister(c *Client) {
|
|||
return
|
||||
}
|
||||
|
||||
if connectionRequiresSasl(c) {
|
||||
c.destroy(false)
|
||||
return
|
||||
}
|
||||
|
||||
// client MUST send PASS (or AUTHENTICATE, if skip-server-password is set)
|
||||
// before completing the other registration commands
|
||||
if !c.Authorized() {
|
||||
|
|
@ -467,6 +462,12 @@ func (server *Server) tryRegister(c *Client) {
|
|||
return
|
||||
}
|
||||
|
||||
// Check if connection requires SASL
|
||||
if connectionRequiresSasl(c) {
|
||||
c.destroy(false)
|
||||
return
|
||||
}
|
||||
|
||||
// check KLINEs
|
||||
isBanned, info := server.klines.CheckMasks(c.AllNickmasks()...)
|
||||
if isBanned {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue