Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ldap: Adjust log settings when a user is not found. #5771

Merged
merged 2 commits into from
Jan 19, 2019
Merged

ldap: Adjust log settings when a user is not found. #5771

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfbdffa
ldap: Adjust log settings when a user is not found.
HarshitOnGitHub Jan 18, 2019
9ce90bf
Merge branch 'master' into Issue_3849
techknowlogick Jan 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/auth/ldap/ldap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func checkAdmin(l *ldap.Conn, ls *Source, userDN string) bool {
if err != nil {
log.Error(4, "LDAP Admin Search failed unexpectedly! (%v)", err)
} else if len(sr.Entries) < 1 {
log.Error(4, "LDAP Admin Search failed")
log.Trace("LDAP Admin Search found no matching entries.")
} else {
return true
}
Expand Down Expand Up @@ -259,9 +259,9 @@ func (ls *Source) SearchEntry(name, passwd string, directBind bool) *SearchResul
return nil
} else if len(sr.Entries) < 1 {
if directBind {
log.Error(4, "User filter inhibited user login.")
log.Trace("User filter inhibited user login.")
} else {
log.Error(4, "LDAP Search failed unexpectedly! (0 entries)")
log.Trace("LDAP Search found no matching entries.")
}

return nil
Expand Down