Merge branch 'dev' of github.com:gogits/gogs into dev

This commit is contained in:
Unknown 2014-05-15 23:03:31 -04:00
commit 44f1ef2493
1 changed files with 1 additions and 2 deletions

View File

@ -54,9 +54,8 @@ func LoginUser(name, passwd string) (a string, r bool) {
// searchEntry : search an LDAP source if an entry (name, passwd) is valide and in the specific filter // searchEntry : search an LDAP source if an entry (name, passwd) is valide and in the specific filter
func (ls Ldapsource) SearchEntry(name, passwd string) (string, bool) { func (ls Ldapsource) SearchEntry(name, passwd string) (string, bool) {
l, err := ldapDial(ls) l, err := ldapDial(ls)
if err != nil { if err != nil {
log.Debug("LDAP Connect error, disabled source %s", ls.Host) log.Error("LDAP Connect error, %s:%v", ls.Host, err)
ls.Enabled = false ls.Enabled = false
return "", false return "", false
} }