Browse Source

bug fixed #193

tags/v0.9.99
Lunny Xiao 10 years ago
parent
commit
f4486f3eec
2 changed files with 8 additions and 3 deletions
  1. 7
    3
      models/login.go
  2. 1
    0
      routers/admin/auths.go

+ 7
- 3
models/login.go View File

@@ -16,6 +16,7 @@ import (
"github.com/go-xorm/xorm"

"github.com/gogits/gogs/modules/auth/ldap"
"github.com/gogits/gogs/modules/log"
)

// Login types.
@@ -194,14 +195,17 @@ func LoginUser(uname, passwd string) (*User, error) {
u, err := LoginUserLdapSource(nil, uname, passwd,
source.Id, source.Cfg.(*LDAPConfig), true)
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 {
u, err := LoginUserSMTPSource(nil, uname, passwd,
source.Id, source.Cfg.(*SMTPConfig), true)

if err == nil {
return u, err
return u, nil
} else {
log.Warn("try smtp login", source.Name, "by", uname, "error:", err)
}
}
}

+ 1
- 0
routers/admin/auths.go View File

@@ -144,6 +144,7 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
}

u := models.LoginSource{
Id: form.Id,
Name: form.AuthName,
IsActived: form.IsActived,
Type: form.Type,

Loading…
Cancel
Save