serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2024-12-27 08:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't recurse into error checking function xcheckf when sendmail fails

Browse source 
found when wanting to get rid of the only non-err "shadowing" warning.
This commit is contained in:
Mechiel Lukkien 2023-07-24 14:08:27 +02:00
parent b7a0904907
commit bca33c0364
No known key found for this signature in database
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sendmail.go
View file

@ -207,8 +207,9 @@ binary should be setgid that group:
// Message seems acceptable. We'll try to deliver it from here. If that fails, we // Message seems acceptable. We'll try to deliver it from here. If that fails, we
// store the message in the users home directory. // store the message in the users home directory.
// Must only use xsavecheckf for error checking in the code below.
xcheckf := func(err error, format string, args ...any) { xsavecheckf := func(err error, format string, args ...any) {
if err == nil { if err == nil {
return return
} }
@ -239,7 +240,7 @@ binary should be setgid that group:
addr := net.JoinHostPort(submitconf.Host, fmt.Sprintf("%d", submitconf.Port)) addr := net.JoinHostPort(submitconf.Host, fmt.Sprintf("%d", submitconf.Port))
d := net.Dialer{Timeout: 30 * time.Second} d := net.Dialer{Timeout: 30 * time.Second}
conn, err := d.Dial("tcp", addr) conn, err := d.Dial("tcp", addr)
xcheckf(err, "dial submit server") xsavecheckf(err, "dial submit server")
var auth []sasl.Client var auth []sasl.Client
switch submitconf.AuthMethod { switch submitconf.AuthMethod {
@ -270,19 +271,19 @@ binary should be setgid that group:
} }
ourHostname, err := dns.ParseDomain(submitconf.LocalHostname) ourHostname, err := dns.ParseDomain(submitconf.LocalHostname)
xcheckf(err, "parsing our local hostname") xsavecheckf(err, "parsing our local hostname")
var remoteHostname dns.Domain var remoteHostname dns.Domain
if net.ParseIP(submitconf.Host) != nil { if net.ParseIP(submitconf.Host) != nil {
remoteHostname, err = dns.ParseDomain(submitconf.Host) remoteHostname, err = dns.ParseDomain(submitconf.Host)
xcheckf(err, "parsing remote hostname") xsavecheckf(err, "parsing remote hostname")
} }
client, err := smtpclient.New(ctx, mlog.New("sendmail"), conn, tlsMode, ourHostname, remoteHostname, auth) client, err := smtpclient.New(ctx, mlog.New("sendmail"), conn, tlsMode, ourHostname, remoteHostname, auth)
xcheckf(err, "open smtp session") xsavecheckf(err, "open smtp session")
err = client.Deliver(ctx, submitconf.From, recipient, int64(len(msg)), strings.NewReader(msg), true, false) err = client.Deliver(ctx, submitconf.From, recipient, int64(len(msg)), strings.NewReader(msg), true, false)
xcheckf(err, "submit message") xsavecheckf(err, "submit message")
if err := client.Close(); err != nil { if err := client.Close(); err != nil {
log.Printf("closing smtp session after message was sent: %v", err) log.Printf("closing smtp session after message was sent: %v", err)