as per lafriks

zeripath · zeripath · commit e0e045ab48e3 · 2021-08-07T16:04:14.000+01:00
Signed-off-by: Andrew Thornton &lt;art27@cantab.net&gt;
diff --git a/services/auth/source/smtp/auth.go b/services/auth/source/smtp/auth.go
@@ -65,8 +65,7 @@ func Authenticate(a smtp.Auth, source *Source) error {
 	}
 	defer conn.Close()
 
-	isSecureConn := source.ForceSMTPS || source.Port == 465
-	if isSecureConn {
+	if source.UseTLS() {
 		conn = tls.Client(conn, tlsConfig)
 	}
 
@@ -92,7 +91,7 @@ func Authenticate(a smtp.Auth, source *Source) error {
 
 	// If not using SMTPS, always use STARTTLS if available
 	hasStartTLS, _ := client.Extension("STARTTLS")
-	if !isSecureConn && hasStartTLS {
+	if !source.UseTLS() && hasStartTLS {
 		if err = client.StartTLS(tlsConfig); err != nil {
 			return fmt.Errorf("failed to start StartTLS: %v", err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,7 @@ func Authenticate(a smtp.Auth, source *Source) error {`
`65`	`65`	`}`
`66`	`66`	`defer conn.Close()`
`67`	`67`
`68`		`- isSecureConn := source.ForceSMTPS \|\| source.Port == 465`
`69`		`- if isSecureConn {`
	`68`	`+ if source.UseTLS() {`
`70`	`69`	`conn = tls.Client(conn, tlsConfig)`
`71`	`70`	`}`
`72`	`71`
`@@ -92,7 +91,7 @@ func Authenticate(a smtp.Auth, source *Source) error {`
`92`	`91`
`93`	`92`	`// If not using SMTPS, always use STARTTLS if available`
`94`	`93`	`hasStartTLS, _ := client.Extension("STARTTLS")`
`95`		`- if !isSecureConn && hasStartTLS {`
	`94`	`+ if !source.UseTLS() && hasStartTLS {`
`96`	`95`	`if err = client.StartTLS(tlsConfig); err != nil {`
`97`	`96`	`return fmt.Errorf("failed to start StartTLS: %v", err)`
`98`	`97`	`}`