From: Peter <peter@smitmail.eu>
Date: Thu, 18 Dec 2014 12:15:13 +0000 (+0200)
Subject: Prefer CRAM-MD5 over PLAIN authentication
X-Git-Tag: v0.9.99~1570^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eca42bcb4480d23c3bd0c3bda05f1f7e185053cd;p=gitea.git

Prefer CRAM-MD5 over PLAIN authentication
---

diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go
index daee5d76e8..2347235909 100644
--- a/modules/mailer/mailer.go
+++ b/modules/mailer/mailer.go
@@ -113,10 +113,10 @@ func sendMail(settings *setting.Mailer, from string, recipients []string, msgCon
 	if auth_available && len(settings.User) > 0 {
 		var auth smtp.Auth
 
-		if strings.Contains(options, "PLAIN") {
-			auth = smtp.PlainAuth("", settings.User, settings.Passwd, host)
-		} else if strings.Contains(options, "CRAM-MD5") {
+		if strings.Contains(options, "CRAM-MD5") {
 			auth = smtp.CRAMMD5Auth(settings.User, settings.Passwd)
+		} else if strings.Contains(options, "PLAIN") {
+			auth = smtp.PlainAuth("", settings.User, settings.Passwd, host)
 		}
 
 		if auth != nil {