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

in DSN, don't add a comment with a nil IP address if we don't have an IP

Browse source
This commit is contained in:
Mechiel Lukkien 2023-06-16 09:55:45 +02:00
parent b190a2cda8
commit e81ed7af26
No known key found for this signature in database
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dsn/dsn.go
View file

@ -262,7 +262,11 @@ func (m *Message) Compose(log *mlog.Log, smtputf8 bool) ([]byte, error) {
status("Status", statusLine) // ../rfc/3464:975 status("Status", statusLine) // ../rfc/3464:975
if !r.RemoteMTA.IsZero() { if !r.RemoteMTA.IsZero() {
// ../rfc/3464:1015 // ../rfc/3464:1015
status("Remote-MTA", fmt.Sprintf("dns;%s (%s)", r.RemoteMTA.Name, smtp.AddressLiteral(r.RemoteMTA.IP))) s := "dns;" + r.RemoteMTA.Name
if len(r.RemoteMTA.IP) > 0 {
s += " (" + smtp.AddressLiteral(r.RemoteMTA.IP) + ")"
}
status("Remote-MTA", s)
} }
// Presence of Diagnostic-Code indicates the code is from Remote-MTA. ../rfc/3464:1053 // Presence of Diagnostic-Code indicates the code is from Remote-MTA. ../rfc/3464:1053
if r.DiagnosticCode != "" { if r.DiagnosticCode != "" {