diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 2 | ||||
| -rw-r--r-- | utils/mail.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/utils/config.go b/utils/config.go index 536d0d802..46daf203c 100644 --- a/utils/config.go +++ b/utils/config.go @@ -234,8 +234,8 @@ func LoadConfig(fileName string) { // Check for a valid email for feedback, if not then do feedback@domain if _, err := mail.ParseAddress(config.EmailSettings.FeedbackEmail); err != nil { - config.EmailSettings.FeedbackEmail = "feedback@localhost" l4g.Error("Misconfigured feedback email setting: %s", config.EmailSettings.FeedbackEmail) + config.EmailSettings.FeedbackEmail = "feedback@localhost" } configureLog(config.LogSettings) diff --git a/utils/mail.go b/utils/mail.go index f02e21253..783a2de8c 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -79,6 +79,9 @@ func newSMTPClient(conn net.Conn) (*smtp.Client, *model.AppError) { ServerName: host, } c.StartTLS(tlsconfig) + if err = c.Auth(auth); err != nil { + return nil, model.NewAppError("SendMail", "Failed to authenticate on SMTP server", err.Error()) + } } return c, nil } |