Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

minor fix on #1517

Browse source
This commit is contained in:
Unknwon 2015-08-20 19:12:55 +08:00
parent 062adbed8a
commit d7c3c79c00
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/mailer/mailer.go
View file

@ -12,7 +12,7 @@ import (
"net/smtp"
"os"
"strings"
"errors"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
)
@ -21,7 +21,7 @@ type loginAuth struct {
username, password string
}
//SMTP AUTH LOGIN Auth Handler
// SMTP AUTH LOGIN Auth Handler
func LoginAuth(username, password string) smtp.Auth {
return &loginAuth{username, password}
}
@ -38,7 +38,7 @@ func (a *loginAuth) Next(fromServer []byte, more bool) ([]byte, error) {
case "Password:":
return []byte(a.password), nil
default:
return nil, errors.New("Unkown fromServer")
return nil, fmt.Errorf("unknwon fromServer: %s", string(fromServer))
}
}
return nil, nil
@ -162,8 +162,8 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte)
auth = smtp.CRAMMD5Auth(settings.User, settings.Passwd)
} else if strings.Contains(options, "PLAIN") {
auth = smtp.PlainAuth("", settings.User, settings.Passwd, host)
//Patch for AUTH LOGIN
} else if strings.Contains(options, "LOGIN") {
// Patch for AUTH LOGIN
auth = LoginAuth(settings.User, settings.Passwd)
}