fix paged search with multiple bases (LDAP)#13865
Merged
MorrisJobke merged 3 commits intomasterfrom Jan 29, 2019
Merged
Conversation
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
blizzz
added
3. to review
Member
Author
|
/backport to stable15 |
Member
Author
|
/backport to stable14 |
blizzz
changed the title
parallel search is not compatible with paged search, but the letter is usually always applied. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
blizzz
force-pushed
the
fix/noid/ldap-pagedsearch-multiplebases
branch
from
8f0f9d8 to
c868892
Compare
Member
Author
|
@juliushaertl is drone showing something different to me?
Or, if that was from the second commit that introduced the integration test only, then this is what should have happened, otherwise the test wouldn't work. |
Member
Yes, just checked the status on the 2nd commit, since the other one was not on the screen. 🙈 Sorry for the noise there. |
|
backport to stable15 in #13884 |
|
The backport to stable14 failed. Please do this backport manually. |
Member
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
refactor (not to backport)will do as seperate PR, less messThere are a couple concepts in LDAP around the search. On is that parallel searches in multiple bases are allowed. The other one are paged searches, that allows to browse through the directory. Alas, they are incompatible to each other. Since we do paged results by default (if present, which in 99% is), we leave the parallel search asside. This PR goes the quick way with so it is easy to backport. A follow up PR will follow to refactor functions for 16.
Included is an integration test (commit 2) that establishes the failing scenario, commit 3 contains the simple, backportable fix.