CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

unregister should boot clients if sasl is required

Browse source
This commit is contained in:
Shivaram Lingamneni 2019-02-14 14:00:54 -05:00
parent 9ce1d31b90
commit 754934b429
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
irc/accounts.go
View file

@ -834,6 +834,7 @@ func (am *AccountManager) loadRawAccount(tx *buntdb.Tx, casefoldedAccount string
}
func (am *AccountManager) Unregister(account string) error {
config := am.server.Config()
casefoldedAccount, err := CasefoldName(account)
if err != nil {
return errAccountDoesNotExist
@ -906,7 +907,13 @@ func (am *AccountManager) Unregister(account string) error {
delete(am.skeletonToAccount, additionalSkel)
}
for _, client := range clients {
am.logoutOfAccount(client)
if config.Accounts.RequireSasl.Enabled {
client.Quit(client.t("You are no longer authorized to be on this server"))
// destroy acquires a semaphore so we can't call it while holding a lock
go client.destroy(false)
} else {
am.logoutOfAccount(client)
}
}
if err != nil {