server: drop Server.caps

No need for this indirection.
tripledubs · Feb 21, 2024 · f7e2f0b · f7e2f0b
1 parent 33fe6a6
commit f7e2f0b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/conn.go b/conn.go
@@ -250,8 +250,12 @@ func (c *Conn) handleGreet(enhanced bool, arg string) {
 		return
 	}
 
-	caps := []string{}
-	caps = append(caps, c.server.caps...)
+	caps := []string{
+		"PIPELINING",
+		"8BITMIME",
+		"ENHANCEDSTATUSCODES",
+		"CHUNKING",
+	}
 	if _, isTLS := c.TLSConnectionState(); c.server.TLSConfig != nil && !isTLS {
 		caps = append(caps, "STARTTLS")
 	}

diff --git a/server.go b/server.go
@@ -73,7 +73,6 @@ type Server struct {
 
 	wg sync.WaitGroup
 
-	caps  []string
 	auths map[string]SaslServerFactory
 	done  chan struct{}
 
@@ -91,7 +90,6 @@ func NewServer(be Backend) *Server {
 		Backend:  be,
 		done:     make(chan struct{}, 1),
 		ErrorLog: log.New(os.Stderr, "smtp/server ", log.LstdFlags),
-		caps:     []string{"PIPELINING", "8BITMIME", "ENHANCEDSTATUSCODES", "CHUNKING"},
 		auths: map[string]SaslServerFactory{
 			sasl.Plain: func(conn *Conn) sasl.Server {
 				return sasl.NewPlainServer(func(identity, username, password string) error {