qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 19:14:44 -07:00
Code Releases Activity

smtp: add *tls.Config argument to StartTLS

Browse Source 
R=rsc, agl1
CC=golang-dev
https://golang.org/cl/3573044
This commit is contained in:
Anthony Martin 2010-12-14 12:22:08 -05:00 committed by Russ Cox
parent d110ae8dd0
commit 11b49ff124
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pkg/smtp/smtp.go
View File

@ -114,12 +114,12 @@ func (c *Client) ehlo() os.Error {
// StartTLS sends the STARTTLS command and encrypts all further communication. // StartTLS sends the STARTTLS command and encrypts all further communication.
// Only servers that advertise the STARTTLS extension support this function. // Only servers that advertise the STARTTLS extension support this function.
func (c *Client) StartTLS() os.Error { func (c *Client) StartTLS(config *tls.Config) os.Error {
_, _, err := c.cmd(220, "STARTTLS") _, _, err := c.cmd(220, "STARTTLS")
if err != nil { if err != nil {
return err return err
} }
c.conn = tls.Client(c.conn, nil) c.conn = tls.Client(c.conn, config)
c.Text = textproto.NewConn(c.conn) c.Text = textproto.NewConn(c.conn)
c.tls = true c.tls = true
return c.ehlo() return c.ehlo()
@ -231,7 +231,7 @@ func SendMail(addr string, a Auth, from string, to []string, msg []byte) os.Erro
return err return err
} }
if ok, _ := c.Extension("STARTTLS"); ok { if ok, _ := c.Extension("STARTTLS"); ok {
if err = c.StartTLS(); err != nil { if err = c.StartTLS(nil); err != nil {
return err return err
} }
} }