Icycoide/RSCC-Forge
1
0
Fork 0
forked from kevadesu/forgejo
Code Pull requests Activity

Batch mirror fix

Browse source
This commit is contained in:
Unknown 2014-04-26 22:34:48 -06:00
parent 1badb2bbcc
commit 59d0e73c35
13 changed files with 68 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

8
routers/user/user.go
View file

@ -91,12 +91,14 @@ func SignInPost(ctx *middleware.Context, form auth.LogInForm) {
var user *models.User
var err error
// try to login against LDAP if defined
if base.LdapAuth {
if base.Service.LdapAuth {
user, err = models.LoginUserLdap(form.UserName, form.Password)
if err != nil {
log.Error("Fail to login through LDAP: %v", err)
}
}
// try local if not LDAP or it's failed
if (!base.LdapAuth) || (err != nil) {
if !base.Service.LdapAuth || err != nil {
user, err = models.LoginUserPlain(form.UserName, form.Password)
}
if err != nil {