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.

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

remove ldap settings check from authenticators #2820

Merged
merged 1 commit into from Sep 13, 2016

Conversation

Projects
None yet
2 participants
@kroepke
Member

kroepke commented Sep 13, 2016

we no longer lock external accounts when ldap is disabled because other authenticators can also create external users now
if people require this we need to track which authenticator created the account in the first place, but that's too large a change for a bug fix release

fixes #2817

remove ldap settings check from authenticators
we no longer lock external accounts when ldap is disabled because other authenticators can also create external users now
if people require this we need to track which authenticator created the account in the first place, but that's too large a change for a bug fix release

fixes #2817

@kroepke kroepke added this to the 2.1.1 milestone Sep 13, 2016

@kroepke

This comment has been minimized.

Member

kroepke commented Sep 13, 2016

needs backport to 2.1 branch after review, too

@kroepke kroepke added bug and removed alerting labels Sep 13, 2016

@bernd bernd self-assigned this Sep 13, 2016

@bernd

This comment has been minimized.

Member

bernd commented Sep 13, 2016

LGTM 👍

@bernd bernd merged commit e7c7127 into master Sep 13, 2016

5 checks passed

ci-server-integration Jenkins build graylog2-server-integration-pr 1366 has succeeded
Details
ci-web-linter Jenkins build graylog-pr-linter-check 848 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
licence/cla Contributor License Agreement is signed.
Details

@bernd bernd deleted the issue-2817 branch Sep 13, 2016

bernd added a commit that referenced this pull request Sep 13, 2016

Remove ldap settings check from authenticators (#2820)
we no longer lock external accounts when ldap is disabled because other authenticators can also create external users now
if people require this we need to track which authenticator created the account in the first place, but that's too large a change for a bug fix release

fixes #2817
(cherry picked from commit e7c7127)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment