diff --git a/pkg/services/multildap/multildap.go b/pkg/services/multildap/multildap.go index d2560d07e93..07c19b19fd5 100644 --- a/pkg/services/multildap/multildap.go +++ b/pkg/services/multildap/multildap.go @@ -19,6 +19,9 @@ var newLDAP = ldap.New // ErrInvalidCredentials is returned if username and password do not match var ErrInvalidCredentials = ldap.ErrInvalidCredentials +// ErrCouldNotFindUser is returned when username hasn't been found (not username+password) +var ErrCouldNotFindUser = ldap.ErrCouldNotFindUser + // ErrNoLDAPServers is returned when there is no LDAP servers specified var ErrNoLDAPServers = errors.New("No LDAP servers are configured") @@ -76,7 +79,7 @@ func (multiples *MultiLDAP) Login(query *models.LoginUserQuery) ( } // Continue if we couldn't find the user - if err == ErrInvalidCredentials { + if err == ErrCouldNotFindUser { continue } diff --git a/pkg/services/multildap/multildap_test.go b/pkg/services/multildap/multildap_test.go index f1ab230619e..03951122e2b 100644 --- a/pkg/services/multildap/multildap_test.go +++ b/pkg/services/multildap/multildap_test.go @@ -82,10 +82,10 @@ func TestMultiLDAP(t *testing.T) { teardown() }) - Convey("Should still call a second error for invalid cred error", func() { + Convey("Should still call a second error for invalid not found error", func() { mock := setup() - mock.loginErrReturn = ErrInvalidCredentials + mock.loginErrReturn = ErrCouldNotFindUser multi := New([]*ldap.ServerConfig{ {}, {},