|
@@ -610,12 +610,12 @@ func nsLoginThrottleCheck(client *Client, rb *ResponseBuffer) (success bool) {
|
610
|
610
|
return true
|
611
|
611
|
}
|
612
|
612
|
|
613
|
|
-// if enforce-account-name is set, account name and nickname must be equal,
|
|
613
|
+// if force-nick-equals-account is set, account name and nickname must be equal,
|
614
|
614
|
// so we need to re-NICK automatically on every login event (IDENTIFY,
|
615
|
615
|
// VERIFY, and a REGISTER that auto-verifies). if we can't get the nick
|
616
|
616
|
// then we log them out (they will be able to reattach with SASL)
|
617
|
617
|
func nsFixNickname(client *Client, rb *ResponseBuffer, config *Config) (success bool) {
|
618
|
|
- if !config.Accounts.NickReservation.EnforceAccountName {
|
|
618
|
+ if !config.Accounts.NickReservation.ForceNickEqualsAccount {
|
619
|
619
|
return true
|
620
|
620
|
}
|
621
|
621
|
// don't need to supply a nickname, SetNick will use the account name
|
|
@@ -753,7 +753,7 @@ func nsRegisterHandler(server *Server, client *Client, command string, params []
|
753
|
753
|
|
754
|
754
|
config := server.Config()
|
755
|
755
|
account := details.nick
|
756
|
|
- if config.Accounts.NickReservation.EnforceGuestFormat {
|
|
756
|
+ if config.Accounts.NickReservation.ForceGuestFormat {
|
757
|
757
|
matches := config.Accounts.NickReservation.guestRegexp.FindStringSubmatch(account)
|
758
|
758
|
if matches == nil || len(matches) < 2 {
|
759
|
759
|
nsNotice(rb, client.t("Erroneous nickname"))
|