NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-23 20:17:03 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

bug fixed #193

Browse source
This commit is contained in:
Lunny Xiao 2014-05-15 22:34:36 +08:00
parent 4f042d12bd
commit f4486f3eec
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
models/login.go
View file

@ -16,6 +16,7 @@ import (
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
"github.com/gogits/gogs/modules/auth/ldap" "github.com/gogits/gogs/modules/auth/ldap"
"github.com/gogits/gogs/modules/log"
) )
// Login types. // Login types.
@ -194,14 +195,17 @@ func LoginUser(uname, passwd string) (*User, error) {
u, err := LoginUserLdapSource(nil, uname, passwd, u, err := LoginUserLdapSource(nil, uname, passwd,
source.Id, source.Cfg.(*LDAPConfig), true) source.Id, source.Cfg.(*LDAPConfig), true)
if err == nil { if err == nil {
return u, err return u, nil
} else {
log.Warn("try ldap login", source.Name, "by", uname, "error:", err)
} }
} else if source.Type == LT_SMTP { } else if source.Type == LT_SMTP {
u, err := LoginUserSMTPSource(nil, uname, passwd, u, err := LoginUserSMTPSource(nil, uname, passwd,
source.Id, source.Cfg.(*SMTPConfig), true) source.Id, source.Cfg.(*SMTPConfig), true)
if err == nil { if err == nil {
return u, err return u, nil
} else {
log.Warn("try smtp login", source.Name, "by", uname, "error:", err)
} }
} }
} }

1
routers/admin/auths.go
View file

@ -144,6 +144,7 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
} }
u := models.LoginSource{ u := models.LoginSource{
Id: form.Id,
Name: form.AuthName, Name: form.AuthName,
IsActived: form.IsActived, IsActived: form.IsActived,
Type: form.Type, Type: form.Type,