extern/mailrelay
1
0
Fork 0
mirror of https://github.com/wiggin77/mailrelay.git synced 2025-08-10 23:53:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

readme updates

Browse Source
This commit is contained in:
wiggin77
2018-11-28 20:24:10 -05:00
parent 3fd8f73c8b
commit 6d3343b632
6 changed files with 100 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client.go
View File

@ -17,8 +17,8 @@ type closeable interface {
}
// sendMail sends the contents of the envelope to a SMTP server.
func sendMail(e *mail.Envelope, config *mailRelayConfig) error {
server := fmt.Sprintf("%s:%d", config.Server, config.Port)
func sendMail(e *mail.Envelope, config *relayConfig) error {
server := fmt.Sprintf("%s:%d", config.SMTPServer, config.SMTPPort)
to := getTo(e)
var msg bytes.Buffer
@ -34,14 +34,14 @@ func sendMail(e *mail.Envelope, config *mailRelayConfig) error {
tlsconfig := &tls.Config{
InsecureSkipVerify: true,
ServerName: config.Server,
ServerName: config.SMTPServer,
}
if conn, err = tls.Dial("tcp", server, tlsconfig); err != nil {
return errors.Wrap(err, "dial error")
}
if client, err = smtp.NewClient(conn, config.Server); err != nil {
if client, err = smtp.NewClient(conn, config.SMTPServer); err != nil {
close(conn, "conn")
return errors.Wrap(err, "newclient error")
}
@ -52,7 +52,7 @@ func sendMail(e *mail.Envelope, config *mailRelayConfig) error {
}
}(&shouldCloseClient)
auth := smtp.PlainAuth("", config.Username, config.Password, config.Server)
auth := smtp.PlainAuth("", config.SMTPUsername, config.SMTPPassword, config.SMTPServer)
if err = client.Auth(auth); err != nil {
return errors.Wrap(err, "auth error")
}