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