mirror of
https://github.com/golang/go
synced 2024-11-12 09:20:22 -07:00
smtp: add *tls.Config argument to StartTLS
R=rsc, agl1 CC=golang-dev https://golang.org/cl/3573044
This commit is contained in:
parent
d110ae8dd0
commit
11b49ff124
@ -114,12 +114,12 @@ func (c *Client) ehlo() os.Error {
|
||||
|
||||
// StartTLS sends the STARTTLS command and encrypts all further communication.
|
||||
// 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")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
c.conn = tls.Client(c.conn, nil)
|
||||
c.conn = tls.Client(c.conn, config)
|
||||
c.Text = textproto.NewConn(c.conn)
|
||||
c.tls = true
|
||||
return c.ehlo()
|
||||
@ -231,7 +231,7 @@ func SendMail(addr string, a Auth, from string, to []string, msg []byte) os.Erro
|
||||
return err
|
||||
}
|
||||
if ok, _ := c.Extension("STARTTLS"); ok {
|
||||
if err = c.StartTLS(); err != nil {
|
||||
if err = c.StartTLS(nil); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user