From 802cb3c41d2cc0b1a2a1c00d01e038f5f89cefc6 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 18 Mar 2024 10:16:57 +0100 Subject: Upgrade go-imap --- imap.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'imap.go') diff --git a/imap.go b/imap.go index e70a394..ebdd2c8 100644 --- a/imap.go +++ b/imap.go @@ -32,18 +32,17 @@ func (s *Server) dialIMAP() (*imapclient.Client, error) { if err != nil { return nil, fmt.Errorf("failed to connect to IMAPS server: %v", err) } + } else if !s.imap.insecure { + c, err = imapclient.DialStartTLS(s.imap.host, options) + if err != nil { + return nil, fmt.Errorf("failed to connect to IMAP server: %v", err) + } } else { conn, err := net.Dial("tcp", s.imap.host) if err != nil { return nil, fmt.Errorf("failed to connect to IMAP server: %v", err) } c = imapclient.New(conn, options) - if !s.imap.insecure { - if err := c.StartTLS(nil); err != nil { - c.Close() - return nil, fmt.Errorf("STARTTLS failed: %v", err) - } - } } return c, err -- cgit v1.2.3-59-g8ed1b