GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-23 03:02:48 +01:00
Code Issues Projects Releases Wiki Activity

config: don't casefold tls names

Browse Source 
I don't think casefolding things like `:6697` ever made sense.
Since these are configured by the ircd operator, it makes sense to
assume they'll already be in a canonical form regardless.
This commit is contained in:
Euan Kemp 2017-07-25 23:27:11 -07:00
parent 449ef4cea1
commit 3b47f3d470
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
irc/config.go
View File

@ -369,12 +369,7 @@ func (conf *Config) TLSListeners() map[string]*tls.Config {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
name, err := CasefoldName(s) tlsListeners[s] = config
if err == nil {
tlsListeners[name] = config
} else {
log.Println("Could not casefold TLS listener:", err.Error())
}
} }
return tlsListeners return tlsListeners
} }

9
web/config.go
View File

@ -11,8 +11,6 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"github.com/oragono/oragono/irc"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )
@ -48,12 +46,7 @@ func (conf *Config) TLSListeners() map[string]*tls.Config {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
name, err := irc.CasefoldName(s) tlsListeners[name] = config
if err == nil {
tlsListeners[name] = config
} else {
log.Println("Could not casefold TLS listener:", err.Error())
}
} }
return tlsListeners return tlsListeners
} }