From 3b47f3d4705825f45c67c07baa1a8982fb1f4491 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Tue, 25 Jul 2017 23:27:11 -0700 Subject: [PATCH] config: don't casefold tls names 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. --- irc/config.go | 7 +------ web/config.go | 9 +-------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/irc/config.go b/irc/config.go index 8a5dae7c..ac840f7e 100644 --- a/irc/config.go +++ b/irc/config.go @@ -369,12 +369,7 @@ func (conf *Config) TLSListeners() map[string]*tls.Config { if err != nil { log.Fatal(err) } - name, err := CasefoldName(s) - if err == nil { - tlsListeners[name] = config - } else { - log.Println("Could not casefold TLS listener:", err.Error()) - } + tlsListeners[s] = config } return tlsListeners } diff --git a/web/config.go b/web/config.go index f8dbad3f..fa68e03e 100644 --- a/web/config.go +++ b/web/config.go @@ -11,8 +11,6 @@ import ( "io/ioutil" "log" - "github.com/oragono/oragono/irc" - "gopkg.in/yaml.v2" ) @@ -48,12 +46,7 @@ func (conf *Config) TLSListeners() map[string]*tls.Config { if err != nil { log.Fatal(err) } - name, err := irc.CasefoldName(s) - if err == nil { - tlsListeners[name] = config - } else { - log.Println("Could not casefold TLS listener:", err.Error()) - } + tlsListeners[name] = config } return tlsListeners }