GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Omit SASL cap when auth is disabled

This commit is contained in:
Daniel Oaks 2019-04-28 01:39:02 +10:00
parent ab4f186673
commit cb1de17ffc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
irc/server.go
View File

@ -654,12 +654,12 @@ func (server *Server) applyConfig(config *Config, initial bool) (err error) {
// SASL // SASL
authPreviouslyEnabled := oldConfig != nil && oldConfig.Accounts.AuthenticationEnabled authPreviouslyEnabled := oldConfig != nil && oldConfig.Accounts.AuthenticationEnabled
if config.Accounts.AuthenticationEnabled && !authPreviouslyEnabled { if config.Accounts.AuthenticationEnabled && (oldConfig == nil || !authPreviouslyEnabled) {
// enabling SASL // enabling SASL
SupportedCapabilities.Enable(caps.SASL) SupportedCapabilities.Enable(caps.SASL)
CapValues.Set(caps.SASL, "PLAIN,EXTERNAL") CapValues.Set(caps.SASL, "PLAIN,EXTERNAL")
addedCaps.Add(caps.SASL) addedCaps.Add(caps.SASL)
} else if !config.Accounts.AuthenticationEnabled && authPreviouslyEnabled { } else if !config.Accounts.AuthenticationEnabled && (oldConfig == nil || authPreviouslyEnabled) {
// disabling SASL // disabling SASL
SupportedCapabilities.Disable(caps.SASL) SupportedCapabilities.Disable(caps.SASL)
removedCaps.Add(caps.SASL) removedCaps.Add(caps.SASL)