# HG changeset patch # User Peter Sanchez # Date 1720811331 21600 # Fri Jul 12 13:08:51 2024 -0600 # Node ID ad9168eef0cb210883f86d3f51ee2bc1db9efa2d # Parent a80d396171f3305e3d3567474eb5f47c357b92ae Fixing function call for new go-smtp diff --git a/smtp/smtp.go b/smtp/smtp.go --- a/smtp/smtp.go +++ b/smtp/smtp.go @@ -52,6 +52,11 @@ if s.config.SMTPEncType == "tls" { c, err = smtp.DialTLS(addr, nil) + } else if s.config.SMTPEncType == "starttls" { + if ok, _ := c.Extension("STARTTLS"); !ok { + panic(fmt.Errorf("smtp: server doesn't support STARTTLS")) + } + c, err = smtp.DialStartTLS(addr, nil) } else { c, err = smtp.Dial(addr) } @@ -64,15 +69,6 @@ return err } - if s.config.SMTPEncType == "starttls" { - if ok, _ := c.Extension("STARTTLS"); !ok { - panic(fmt.Errorf("smtp: server doesn't support STARTTLS")) - } - if err = c.StartTLS(nil); err != nil { - return err - } - } - if s.config.SMTPAuth == "plain" { auth := sasl.NewPlainClient("", s.config.SMTPUser, s.config.SMTPPass) if ok, _ := c.Extension("AUTH"); !ok {