scripte/archivmail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(PROJ-30): imapclient.New — Rueckgabewert an go-imap/v2 beta.8 API anpassen

Browse Source 
imapclient.New gibt in beta.8 nur *Client zurueck (kein error).
Alle drei Aufrufe in Connect() korrigiert.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
sysops
2026-04-03 21:21:03 +02:00
parent a93a843506
commit 0969f76da6
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/imap/client.go
+3 -15
View File
@@ -62,11 +62,7 @@ func Connect(host string, port int, tlsMode string) (*Conn, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("imap connect ssl: %w", err) return nil, fmt.Errorf("imap connect ssl: %w", err)
} }
c, err := imapclient.New(raw, nil) c := imapclient.New(raw, nil)
if err != nil {
raw.Close()
return nil, fmt.Errorf("imap client ssl: %w", err)
}
return &Conn{Client: c, raw: raw}, nil return &Conn{Client: c, raw: raw}, nil
case "starttls": case "starttls":
@@ -74,13 +70,9 @@ func Connect(host string, port int, tlsMode string) (*Conn, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("imap connect starttls: %w", err) return nil, fmt.Errorf("imap connect starttls: %w", err)
} }
c, err := imapclient.New(raw, &imapclient.Options{ c := imapclient.New(raw, &imapclient.Options{
TLSConfig: &tls.Config{ServerName: host}, TLSConfig: &tls.Config{ServerName: host},
}) })
if err != nil {
raw.Close()
return nil, fmt.Errorf("imap client starttls: %w", err)
}
return &Conn{Client: c, raw: raw}, nil return &Conn{Client: c, raw: raw}, nil
case "none": case "none":
@@ -88,11 +80,7 @@ func Connect(host string, port int, tlsMode string) (*Conn, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("imap connect plain: %w", err) return nil, fmt.Errorf("imap connect plain: %w", err)
} }
c, err := imapclient.New(raw, nil) c := imapclient.New(raw, nil)
if err != nil {
raw.Close()
return nil, fmt.Errorf("imap client plain: %w", err)
}
return &Conn{Client: c, raw: raw}, nil return &Conn{Client: c, raw: raw}, nil
default: default: