bug fixed #193

diff --git a/models/login.go b/models/login.go
index be185488acf9e7a91de2445a9ee1d5ad3298006e..aa82eb0036c17bf2b2a656b9859b504f979501d0 100644 (file)
--- a/models/login.go
+++ b/models/login.go
@@ -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)
                                        }
                                }
                        }

diff --git a/routers/admin/auths.go b/routers/admin/auths.go
index b7b382cd94eb19e905a09490c4913d2fe00baea7..bf4bade17bb0c7e5fb12900b2b4981406d61a267 100644 (file)
--- a/routers/admin/auths.go
+++ b/routers/admin/auths.go
@@ -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,