Merge branch 'remote-sender' of beppler/smtprelay into master

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 e-mail address on outgoing SMTP server")
 	versionInfo       = flag.Bool("version", false, "Show version information")
 )
 

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,
 	)

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 =