Browse Source

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.
tags/v0.9.0
Euan Kemp 6 years ago
parent
commit
3b47f3d470
2 changed files with 2 additions and 14 deletions
  1. 1
    6
      irc/config.go
  2. 1
    8
      web/config.go

+ 1
- 6
irc/config.go View File

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

+ 1
- 8
web/config.go View File

@@ -11,8 +11,6 @@ import (
11 11
 	"io/ioutil"
12 12
 	"log"
13 13
 
14
-	"github.com/oragono/oragono/irc"
15
-
16 14
 	"gopkg.in/yaml.v2"
17 15
 )
18 16
 
@@ -48,12 +46,7 @@ func (conf *Config) TLSListeners() map[string]*tls.Config {
48 46
 		if err != nil {
49 47
 			log.Fatal(err)
50 48
 		}
51
-		name, err := irc.CasefoldName(s)
52
-		if err == nil {
53
-			tlsListeners[name] = config
54
-		} else {
55
-			log.Println("Could not casefold TLS listener:", err.Error())
56
-		}
49
+		tlsListeners[name] = config
57 50
 	}
58 51
 	return tlsListeners
59 52
 }

Loading…
Cancel
Save