smtp: add *tls.Config argument to StartTLS

R=rsc, agl1
CC=golang-dev
https://golang.org/cl/3573044

diff --git a/src/pkg/smtp/smtp.go b/src/pkg/smtp/smtp.go
index 3b805166efcecd5fc2e6ae48b0904376c8e0aa55..2f6d2f31a78ae85c01ffbf9e0edeccf18cdb9975 100644 (file)
--- a/src/pkg/smtp/smtp.go
+++ b/src/pkg/smtp/smtp.go
@@ -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
                }
        }