wneessen/go-mail
1
1
Fork 0
mirror of https://github.com/wneessen/go-mail.git synced 2024-11-22 13:50:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Sync with upstream

Browse source 
This PR syncs our smtp package with the upstream `net/smtp` changes introduced via bf91eb3a8b
This commit is contained in:
Winni Neessen 2024-05-24 18:50:27 +02:00
parent 85a99b3a4e
commit 071ad66035
Signed by: wneessen
GPG key ID: 5F3AF39B820C119D
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
smtp/smtp.go
View file

@ -210,7 +210,8 @@ func (c *Client) Auth(a Auth) error {
} }
resp64 := make([]byte, encoding.EncodedLen(len(resp))) resp64 := make([]byte, encoding.EncodedLen(len(resp)))
encoding.Encode(resp64, resp) encoding.Encode(resp64, resp)
code, msg64, err := c.cmd(0, strings.TrimSpace(fmt.Sprintf("AUTH %s %s", mech, resp64))) code, msg64, err := c.cmd(0, "%s", strings.TrimSpace(fmt.Sprintf("AUTH %s %s", mech,
resp64)))
for err == nil { for err == nil {
var msg []byte var msg []byte
switch code { switch code {
@ -238,7 +239,7 @@ func (c *Client) Auth(a Auth) error {
} }
resp64 = make([]byte, encoding.EncodedLen(len(resp))) resp64 = make([]byte, encoding.EncodedLen(len(resp)))
encoding.Encode(resp64, resp) encoding.Encode(resp64, resp)
code, msg64, err = c.cmd(0, string(resp64)) code, msg64, err = c.cmd(0, "%s", resp64)
} }
return err return err
} }

4
smtp/smtp_test.go
View file

@ -1042,12 +1042,12 @@ func TestSendMail(t *testing.T) {
tc := textproto.NewConn(conn) tc := textproto.NewConn(conn)
for i := 0; i < len(data) && data[i] != ""; i++ { for i := 0; i < len(data) && data[i] != ""; i++ {
if err := tc.PrintfLine(data[i]); err != nil { if err := tc.PrintfLine("%s", data[i]); err != nil {
t.Errorf("printing to textproto failed: %s", err) t.Errorf("printing to textproto failed: %s", err)
} }
for len(data[i]) >= 4 && data[i][3] == '-' { for len(data[i]) >= 4 && data[i][3] == '-' {
i++ i++
if err := tc.PrintfLine(data[i]); err != nil { if err := tc.PrintfLine("%s", data[i]); err != nil {
t.Errorf("printing to textproto failed: %s", err) t.Errorf("printing to textproto failed: %s", err)
} }
} }