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

recommended default: advertise SCRAM

Browse source 
Fixes #1782
This commit is contained in:
Shivaram Lingamneni 2023-01-11 09:10:25 -05:00
parent 1e6dee15b2
commit 46d32520c7
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
irc/config.go
View file

@ -303,7 +303,7 @@ func (t *ThrottleConfig) UnmarshalYAML(unmarshal func(interface{}) error) (err e
type AccountConfig struct {
Registration AccountRegistrationConfig
AuthenticationEnabled bool `yaml:"authentication-enabled"`
AdvertiseSCRAM bool `yaml:"advertise-scram"` // undocumented, see #1782
AdvertiseSCRAM bool `yaml:"advertise-scram"`
RequireSasl struct {
Enabled bool
Exempted []string
@ -1390,7 +1390,6 @@ func LoadConfig(filename string) (config *Config, err error) {
}
saslCapValue := "PLAIN,EXTERNAL,SCRAM-SHA-256"
// TODO(#1782) clean this up:
if !config.Accounts.AdvertiseSCRAM {
saslCapValue = "PLAIN,EXTERNAL"
}