From 0b65e904d833868fa392ed9b280e67f2ef46689e Mon Sep 17 00:00:00 2001 From: Carlos Alberto Costa Beppler Date: Fri, 6 Sep 2019 17:07:37 -0300 Subject: [PATCH 1/2] Allows specify the sender used on SMTP conversation with outgoing server. --- config.go | 1 + main.go | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config.go b/config.go index 01c6700..6239ddf 100644 --- a/config.go +++ b/config.go @@ -25,6 +25,7 @@ var ( remoteHost = flag.String("remote_host", "smtp.gmail.com:587", "Outgoing SMTP server") remoteUser = flag.String("remote_user", "", "Username for authentication on outgoing SMTP server") remotePass = flag.String("remote_pass", "", "Password for authentication on outgoing SMTP server") + remoteSender = flag.String("remote_sender", "", "Sender username for messages on outgoing SMTP server") versionInfo = flag.Bool("version", false, "Show version information") ) diff --git a/main.go b/main.go index b11073c..eed758a 100644 --- a/main.go +++ b/main.go @@ -117,10 +117,18 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error { log.Printf("delivering using smarthost %s\n", *remoteHost) + var sender string + + if *remoteSender == "" { + sender = env.Sender + } else { + sender = *remoteSender + } + err := SendMail( *remoteHost, auth, - env.Sender, + sender, env.Recipients, env.Data, ) From 769193ea4d1f454e3a98f23227e9760fab13c3a8 Mon Sep 17 00:00:00 2001 From: Carlos Alberto Costa Beppler Date: Fri, 6 Sep 2019 21:00:35 -0300 Subject: [PATCH 2/2] Adjust the description of remote_sender parameter. It represents the e-mail address used while sending message to the outgoing SMTP server. --- config.go | 2 +- smtprelay.ini | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config.go b/config.go index 6239ddf..f25dbb5 100644 --- a/config.go +++ b/config.go @@ -25,7 +25,7 @@ var ( remoteHost = flag.String("remote_host", "smtp.gmail.com:587", "Outgoing SMTP server") remoteUser = flag.String("remote_user", "", "Username for authentication on outgoing SMTP server") remotePass = flag.String("remote_pass", "", "Password for authentication on outgoing SMTP server") - remoteSender = flag.String("remote_sender", "", "Sender username for messages on outgoing SMTP server") + remoteSender = flag.String("remote_sender", "", "Sender e-mail address on outgoing SMTP server") versionInfo = flag.Bool("version", false, "Show version information") ) diff --git a/smtprelay.ini b/smtprelay.ini index 27795c9..c4c2add 100644 --- a/smtprelay.ini +++ b/smtprelay.ini @@ -54,3 +54,6 @@ ; Authentication credentials on outgoing SMTP server ;remote_user = ;remote_pass = + +; Sender e-mail address on outgoing SMTP server +;remote_sender =